180 files changed, 42942 insertions, 36731 deletions

diff --git a/etc/nova/policy.json b/etc/nova/policy.json
index 056a36b3b..d37ee60a4 100644
--- a/etc/nova/policy.json
+++ b/etc/nova/policy.json
@@ -38,21 +38,26 @@
     "compute_extension:cloudpipe": "rule:admin_api",
     "compute_extension:cloudpipe_update": "rule:admin_api",
     "compute_extension:console_output": "",
+    "compute_extension:v3:consoles:discoverable": "",
     "compute_extension:consoles": "",
     "compute_extension:coverage_ext": "rule:admin_api",
     "compute_extension:createserverext": "",
     "compute_extension:deferred_delete": "",
     "compute_extension:disk_config": "",
     "compute_extension:evacuate": "rule:admin_api",
+    "compute_extension:v3:os-evacuate": "rule:admin_api",
     "compute_extension:extended_server_attributes": "rule:admin_api",
     "compute_extension:extended_status": "",
     "compute_extension:extended_availability_zone": "",
     "compute_extension:extended_ips": "",
     "compute_extension:extended_ips_mac": "",
     "compute_extension:extended_vif_net": "",
+    "compute_extension:v3:extension_info:discoverable": "",
     "compute_extension:fixed_ips": "rule:admin_api",
+    "compute_extension:v3:os-fixed-ips:discoverable": "",
     "compute_extension:v3:os-fixed-ips": "rule:admin_api",
     "compute_extension:flavor_access": "",
+    "compute_extension:v3:os-flavor-access": "",
     "compute_extension:flavor_disabled": "",
     "compute_extension:flavor_rxtx": "",
     "compute_extension:flavor_swap": "",
@@ -76,7 +81,9 @@
     "compute_extension:instance_actions": "",
     "compute_extension:instance_actions:events": "rule:admin_api",
     "compute_extension:instance_usage_audit_log": "rule:admin_api",
+    "compute_extension:v3:ips:discoverable": "",
     "compute_extension:keypairs": "",
+    "compute_extension:v3:os-keypairs:discoverable": "",
     "compute_extension:v3:os-keypairs": "",
     "compute_extension:multinic": "",
     "compute_extension:networks": "rule:admin_api",
@@ -85,14 +92,19 @@
     "compute_extension:quotas:show": "",
     "compute_extension:quotas:update": "rule:admin_api",
     "compute_extension:quotas:delete": "rule:admin_api",
+    "compute_extension:v3:os-quota-sets:show": "",
+    "compute_extension:v3:os-quota-sets:update": "rule:admin_api",
+    "compute_extension:v3:os-quota-sets:delete": "rule:admin_api",
     "compute_extension:quota_classes": "",
     "compute_extension:rescue": "",
+    "compute_extension:v3:os-rescue": "",
     "compute_extension:security_group_default_rules": "rule:admin_api",
     "compute_extension:security_groups": "",
     "compute_extension:server_diagnostics": "rule:admin_api",
     "compute_extension:server_password": "",
     "compute_extension:server_usage": "",
     "compute_extension:services": "rule:admin_api",
+    "compute_extension:v3:servers:discoverable": "",
     "compute_extension:simple_tenant_usage:show": "rule:admin_or_owner",
     "compute_extension:simple_tenant_usage:list": "rule:admin_api",
     "compute_extension:users": "rule:admin_api",
diff --git a/etc/nova/rootwrap.d/network.filters b/etc/nova/rootwrap.d/network.filters
index 02138cff4..9a607bf84 100644
--- a/etc/nova/rootwrap.d/network.filters
+++ b/etc/nova/rootwrap.d/network.filters
@@ -34,6 +34,11 @@ ovs-vsctl: CommandFilter, ovs-vsctl, root
 # nova/network/linux_net.py: 'ovs-ofctl', ....
 ovs-ofctl: CommandFilter, ovs-ofctl, root
 
+# nova/virt/libvirt/vif.py: 'ivs-ctl', ...
+# nova/virt/libvirt/vif.py: 'ivs-ctl', 'del-port', ...
+# nova/network/linux_net.py: 'ivs-ctl', ....
+ivs-ctl: CommandFilter, ivs-ctl, root
+
 # nova/network/linux_net.py: 'ebtables', '-D' ...
 # nova/network/linux_net.py: 'ebtables', '-I' ...
 ebtables: CommandFilter, ebtables, root
diff --git a/nova/api/ec2/cloud.py b/nova/api/ec2/cloud.py
index e02f7b6f9..51a86e02f 100644
--- a/nova/api/ec2/cloud.py
+++ b/nova/api/ec2/cloud.py
@@ -211,9 +211,8 @@ def db_to_inst_obj(context, db_instance):
     # NOTE(danms): This is a temporary helper method for converting
     # Instance DB objects to NovaObjects without needing to re-query.
     inst_obj = instance_obj.Instance._from_db_object(
-        instance_obj.Instance(), db_instance,
+        context, instance_obj.Instance(), db_instance,
         expected_attrs=['system_metadata', 'metadata'])
-    inst_obj._context = context
     return inst_obj
 
 
diff --git a/nova/api/metadata/password.py b/nova/api/metadata/password.py
index 50f6c94ac..793dcc0a7 100644
--- a/nova/api/metadata/password.py
+++ b/nova/api/metadata/password.py
@@ -27,10 +27,10 @@ MAX_SIZE = CHUNKS * CHUNK_LENGTH
 
 def extract_password(instance):
     result = ''
-    for datum in sorted(instance.get('system_metadata', []),
-                        key=lambda x: x['key']):
-        if datum['key'].startswith('password_'):
-            result += datum['value']
+    sys_meta = utils.instance_sys_meta(instance)
+    for key in sorted(sys_meta.keys()):
+        if key.startswith('password_'):
+            result += sys_meta[key]
     return result or None
 
 
diff --git a/nova/api/openstack/common.py b/nova/api/openstack/common.py
index dd746e23d..509256d87 100644
--- a/nova/api/openstack/common.py
+++ b/nova/api/openstack/common.py
@@ -457,6 +457,16 @@ def check_snapshots_enabled(f):
 class ViewBuilder(object):
     """Model API responses as dictionaries."""
 
+    def _get_project_id(self, request):
+        """
+        Get project id from request url if present or empty string
+        otherwise
+        """
+        project_id = request.environ["nova.context"].project_id
+        if project_id in request.url:
+            return project_id
+        return ''
+
     def _get_links(self, request, identifier, collection_name):
         return [{
             "rel": "self",
@@ -475,7 +485,7 @@ class ViewBuilder(object):
         params["marker"] = identifier
         prefix = self._update_compute_link_prefix(request.application_url)
         url = os.path.join(prefix,
-                           request.environ["nova.context"].project_id,
+                           self._get_project_id(request),
                            collection_name)
         return "%s?%s" % (url, dict_to_query_str(params))
 
@@ -483,7 +493,7 @@ class ViewBuilder(object):
         """Return an href string pointing to this object."""
         prefix = self._update_compute_link_prefix(request.application_url)
         return os.path.join(prefix,
-                            request.environ["nova.context"].project_id,
+                            self._get_project_id(request),
                             collection_name,
                             str(identifier))
 
@@ -492,7 +502,7 @@ class ViewBuilder(object):
         base_url = remove_version_from_href(request.application_url)
         base_url = self._update_compute_link_prefix(base_url)
         return os.path.join(base_url,
-                            request.environ["nova.context"].project_id,
+                            self._get_project_id(request),
                             collection_name,
                             str(identifier))
 
diff --git a/nova/api/openstack/compute/contrib/availability_zone.py b/nova/api/openstack/compute/contrib/availability_zone.py
index 22001b65f..1f22bf252 100644
--- a/nova/api/openstack/compute/contrib/availability_zone.py
+++ b/nova/api/openstack/compute/contrib/availability_zone.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from oslo.config import cfg
 
diff --git a/nova/api/openstack/compute/contrib/cell_capacities.py b/nova/api/openstack/compute/contrib/cell_capacities.py
index ae8b42336..ab79b4327 100644
--- a/nova/api/openstack/compute/contrib/cell_capacities.py
+++ b/nova/api/openstack/compute/contrib/cell_capacities.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 
diff --git a/nova/api/openstack/compute/contrib/certificates.py b/nova/api/openstack/compute/contrib/certificates.py
index 4fe49aadf..979008a87 100644
--- a/nova/api/openstack/compute/contrib/certificates.py
+++ b/nova/api/openstack/compute/contrib/certificates.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 import webob.exc
 
diff --git a/nova/api/openstack/compute/contrib/console_output.py b/nova/api/openstack/compute/contrib/console_output.py
index eb20b3275..07b3f2556 100644
--- a/nova/api/openstack/compute/contrib/console_output.py
+++ b/nova/api/openstack/compute/contrib/console_output.py
@@ -14,7 +14,7 @@
 #    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
+#    under the License.
 
 import re
 import webob
diff --git a/nova/api/openstack/compute/contrib/consoles.py b/nova/api/openstack/compute/contrib/consoles.py
index bf1f41690..8247620f2 100644
--- a/nova/api/openstack/compute/contrib/consoles.py
+++ b/nova/api/openstack/compute/contrib/consoles.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 import webob
 
diff --git a/nova/api/openstack/compute/contrib/coverage_ext.py b/nova/api/openstack/compute/contrib/coverage_ext.py
index 154699470..fd1ad53e9 100644
--- a/nova/api/openstack/compute/contrib/coverage_ext.py
+++ b/nova/api/openstack/compute/contrib/coverage_ext.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 # See: http://wiki.openstack.org/Nova/CoverageExtension for more information
 # and usage explanation for this API extension
@@ -134,11 +134,12 @@ class CoverageController(object):
             # doesn't resolve to 127.0.0.1. Currently backdoors only open on
             # loopback so this is for covering the common single host use case
             except socket.error as e:
+                exc_info = sys.exc_info()
                 if 'ECONNREFUSED' in e and service['host'] == self.host:
                         service['telnet'] = telnetlib.Telnet('127.0.0.1',
                                                              service['port'])
                 else:
-                    raise e
+                    raise exc_info[0], exc_info[1], exc_info[2]
             self.services.append(service)
             self._start_coverage_telnet(service['telnet'], service['service'])
 
diff --git a/nova/api/openstack/compute/contrib/createserverext.py b/nova/api/openstack/compute/contrib/createserverext.py
index 337fedae6..9559ceef3 100644
--- a/nova/api/openstack/compute/contrib/createserverext.py
+++ b/nova/api/openstack/compute/contrib/createserverext.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 
diff --git a/nova/api/openstack/compute/contrib/disk_config.py b/nova/api/openstack/compute/contrib/disk_config.py
index f2b906144..692ed6455 100644
--- a/nova/api/openstack/compute/contrib/disk_config.py
+++ b/nova/api/openstack/compute/contrib/disk_config.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 """Disk Config extension."""
 
diff --git a/nova/api/openstack/compute/contrib/extended_floating_ips.py b/nova/api/openstack/compute/contrib/extended_floating_ips.py
index 06f1fa903..44b84bad9 100644
--- a/nova/api/openstack/compute/contrib/extended_floating_ips.py
+++ b/nova/api/openstack/compute/contrib/extended_floating_ips.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 
diff --git a/nova/api/openstack/compute/contrib/flavormanage.py b/nova/api/openstack/compute/contrib/flavormanage.py
index 43d5d2110..602e82c36 100644
--- a/nova/api/openstack/compute/contrib/flavormanage.py
+++ b/nova/api/openstack/compute/contrib/flavormanage.py
@@ -10,7 +10,7 @@
 #    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
+#    under the License.
 
 import webob
 
@@ -76,6 +76,8 @@ class FlavorManageController(wsgi.Controller):
         except (exception.InstanceTypeExists,
                 exception.InstanceTypeIdExists) as err:
             raise webob.exc.HTTPConflict(explanation=err.format_message())
+        except exception.InvalidInput as exc:
+            raise webob.exc.HTTPBadRequest(explanation=exc.format_message())
 
         return self._view_builder.show(req, flavor)
 
diff --git a/nova/api/openstack/compute/contrib/floating_ip_dns.py b/nova/api/openstack/compute/contrib/floating_ip_dns.py
index ecaa8e7b9..1d6a8b812 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_dns.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_dns.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 import urllib
 
diff --git a/nova/api/openstack/compute/contrib/floating_ip_pools.py b/nova/api/openstack/compute/contrib/floating_ip_pools.py
index e792ce433..aefe65d26 100644
--- a/nova/api/openstack/compute/contrib/floating_ip_pools.py
+++ b/nova/api/openstack/compute/contrib/floating_ip_pools.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
diff --git a/nova/api/openstack/compute/contrib/floating_ips.py b/nova/api/openstack/compute/contrib/floating_ips.py
index 284a211cd..807201e7e 100644
--- a/nova/api/openstack/compute/contrib/floating_ips.py
+++ b/nova/api/openstack/compute/contrib/floating_ips.py
@@ -15,7 +15,7 @@
 #    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
+#    under the License.
 
 import webob
 
diff --git a/nova/api/openstack/compute/contrib/multiple_create.py b/nova/api/openstack/compute/contrib/multiple_create.py
index fd450b6d8..ee3dcf4b4 100644
--- a/nova/api/openstack/compute/contrib/multiple_create.py
+++ b/nova/api/openstack/compute/contrib/multiple_create.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 
diff --git a/nova/api/openstack/compute/contrib/scheduler_hints.py b/nova/api/openstack/compute/contrib/scheduler_hints.py
index 0775307f4..0a5136205 100644
--- a/nova/api/openstack/compute/contrib/scheduler_hints.py
+++ b/nova/api/openstack/compute/contrib/scheduler_hints.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 import webob.exc
 
diff --git a/nova/api/openstack/compute/contrib/security_groups.py b/nova/api/openstack/compute/contrib/security_groups.py
index b34a77cab..e2862be4e 100644
--- a/nova/api/openstack/compute/contrib/security_groups.py
+++ b/nova/api/openstack/compute/contrib/security_groups.py
@@ -16,6 +16,7 @@
 
 """The security groups extension."""
 
+import contextlib
 import json
 import webob
 from webob import exc
@@ -177,6 +178,25 @@ class SecurityGroupRulesXMLDeserializer(wsgi.MetadataXMLDeserializer):
         return sg_rule
 
 
+@contextlib.contextmanager
+def translate_exceptions():
+    """Translate nova exceptions to http exceptions."""
+    try:
+        yield
+    except exception.Invalid as exp:
+        msg = exp.format_message()
+        raise exc.HTTPBadRequest(explanation=msg)
+    except exception.SecurityGroupNotFound as exp:
+        msg = exp.format_message()
+        raise exc.HTTPNotFound(explanation=msg)
+    except exception.InstanceNotFound as exp:
+        msg = exp.format_message()
+        raise exc.HTTPNotFound(explanation=msg)
+    except exception.SecurityGroupLimitExceeded as exp:
+        msg = exp.format_message()
+        raise exc.HTTPRequestEntityTooLarge(explanation=msg)
+
+
 class SecurityGroupControllerBase(object):
     """Base class for Security Group controllers."""
 
@@ -196,8 +216,9 @@ class SecurityGroupControllerBase(object):
         sg_rule['group'] = {}
         sg_rule['ip_range'] = {}
         if rule['group_id']:
-            source_group = self.security_group_api.get(context,
-                                                       id=rule['group_id'])
+            with translate_exceptions():
+                source_group = self.security_group_api.get(context,
+                                                           id=rule['group_id'])
             sg_rule['group'] = {'name': source_group.get('name'),
                              'tenant_id': source_group.get('project_id')}
         else:
@@ -233,10 +254,10 @@ class SecurityGroupController(SecurityGroupControllerBase):
         """Return data about the given security group."""
         context = _authorize_context(req)
 
-        id = self.security_group_api.validate_id(id)
-
-        security_group = self.security_group_api.get(context, None, id,
-                                                     map_exception=True)
+        with translate_exceptions():
+            id = self.security_group_api.validate_id(id)
+            security_group = self.security_group_api.get(context, None, id,
+                                                         map_exception=True)
 
         return {'security_group': self._format_security_group(context,
                                                               security_group)}
@@ -245,12 +266,11 @@ class SecurityGroupController(SecurityGroupControllerBase):
         """Delete a security group."""
         context = _authorize_context(req)
 
-        id = self.security_group_api.validate_id(id)
-
-        security_group = self.security_group_api.get(context, None, id,
-                                                     map_exception=True)
-
-        self.security_group_api.destroy(context, security_group)
+        with translate_exceptions():
+            id = self.security_group_api.validate_id(id)
+            security_group = self.security_group_api.get(context, None, id,
+                                                         map_exception=True)
+            self.security_group_api.destroy(context, security_group)
 
         return webob.Response(status_int=202)
 
@@ -262,9 +282,11 @@ class SecurityGroupController(SecurityGroupControllerBase):
         search_opts = {}
         search_opts.update(req.GET)
 
-        raw_groups = self.security_group_api.list(context,
-                                                  project=context.project_id,
-                                                  search_opts=search_opts)
+        with translate_exceptions():
+            project_id = context.project_id
+            raw_groups = self.security_group_api.list(context,
+                                                      project=project_id,
+                                                      search_opts=search_opts)
 
         limited_list = common.limited(raw_groups, req)
         result = [self._format_security_group(context, group)
@@ -285,16 +307,12 @@ class SecurityGroupController(SecurityGroupControllerBase):
         group_name = security_group.get('name', None)
         group_description = security_group.get('description', None)
 
-        self.security_group_api.validate_property(group_name, 'name', None)
-        self.security_group_api.validate_property(group_description,
-                                                  'description', None)
-
-        try:
+        with translate_exceptions():
+            self.security_group_api.validate_property(group_name, 'name', None)
+            self.security_group_api.validate_property(group_description,
+                                                      'description', None)
             group_ref = self.security_group_api.create_security_group(
                 context, group_name, group_description)
-        except exception.SecurityGroupLimitExceeded as err:
-            raise exc.HTTPRequestEntityTooLarge(
-                explanation=err.format_message())
 
         return {'security_group': self._format_security_group(context,
                                                               group_ref)}
@@ -304,21 +322,21 @@ class SecurityGroupController(SecurityGroupControllerBase):
         """Update a security group."""
         context = _authorize_context(req)
 
-        id = self.security_group_api.validate_id(id)
+        with translate_exceptions():
+            id = self.security_group_api.validate_id(id)
+            security_group = self.security_group_api.get(context, None, id,
+                                                         map_exception=True)
 
-        security_group = self.security_group_api.get(context, None, id,
-                                                     map_exception=True)
         security_group_data = self._from_body(body, 'security_group')
-
         group_name = security_group_data.get('name', None)
         group_description = security_group_data.get('description', None)
 
-        self.security_group_api.validate_property(group_name, 'name', None)
-        self.security_group_api.validate_property(group_description,
-                                                  'description', None)
-
-        group_ref = self.security_group_api.update_security_group(
-            context, security_group, group_name, group_description)
+        with translate_exceptions():
+            self.security_group_api.validate_property(group_name, 'name', None)
+            self.security_group_api.validate_property(group_description,
+                                                      'description', None)
+            group_ref = self.security_group_api.update_security_group(
+                context, security_group, group_name, group_description)
 
         return {'security_group': self._format_security_group(context,
                                                               group_ref)}
@@ -333,11 +351,12 @@ class SecurityGroupRulesController(SecurityGroupControllerBase):
 
         sg_rule = self._from_body(body, 'security_group_rule')
 
-        parent_group_id = self.security_group_api.validate_id(
-            sg_rule.get('parent_group_id', None))
-
-        security_group = self.security_group_api.get(context, None,
-                                          parent_group_id, map_exception=True)
+        with translate_exceptions():
+            parent_group_id = self.security_group_api.validate_id(
+                sg_rule.get('parent_group_id', None))
+            security_group = self.security_group_api.get(context, None,
+                                                         parent_group_id,
+                                                         map_exception=True)
         try:
             new_rule = self._rule_args_to_dict(context,
                               to_port=sg_rule.get('to_port'),
@@ -360,13 +379,10 @@ class SecurityGroupRulesController(SecurityGroupControllerBase):
                 msg = _("Bad prefix for network in cidr %s") % new_rule['cidr']
                 raise exc.HTTPBadRequest(explanation=msg)
 
-        try:
+        with translate_exceptions():
             security_group_rule = (
                 self.security_group_api.create_security_group_rule(
                     context, security_group, new_rule))
-        except exception.SecurityGroupLimitExceeded as err:
-            raise exc.HTTPRequestEntityTooLarge(
-                explanation=err.format_message())
 
         return {"security_group_rule": self._format_security_group_rule(
                                                         context,
@@ -390,17 +406,15 @@ class SecurityGroupRulesController(SecurityGroupControllerBase):
     def delete(self, req, id):
         context = _authorize_context(req)
 
-        id = self.security_group_api.validate_id(id)
-
-        rule = self.security_group_api.get_rule(context, id)
-
-        group_id = rule['parent_group_id']
-
-        security_group = self.security_group_api.get(context, None, group_id,
-                                                     map_exception=True)
-
-        self.security_group_api.remove_rules(context, security_group,
-                                             [rule['id']])
+        with translate_exceptions():
+            id = self.security_group_api.validate_id(id)
+            rule = self.security_group_api.get_rule(context, id)
+            group_id = rule['parent_group_id']
+            security_group = self.security_group_api.get(context, None,
+                                                         group_id,
+                                                         map_exception=True)
+            self.security_group_api.remove_rules(context, security_group,
+                                                 [rule['id']])
 
         return webob.Response(status_int=202)
 
@@ -414,13 +428,11 @@ class ServerSecurityGroupController(SecurityGroupControllerBase):
 
         self.security_group_api.ensure_default(context)
 
-        try:
+        with translate_exceptions():
             instance = self.compute_api.get(context, server_id)
-        except exception.InstanceNotFound as exp:
-            raise exc.HTTPNotFound(explanation=exp.format_message())
+            groups = self.security_group_api.get_instance_security_groups(
+                context, instance['uuid'], True)
 
-        groups = self.security_group_api.get_instance_security_groups(
-            context, instance['uuid'], True)
         result = [self._format_security_group(context, group)
                     for group in groups]
 
@@ -455,15 +467,9 @@ class SecurityGroupActionController(wsgi.Controller):
         return group_name
 
     def _invoke(self, method, context, id, group_name):
-        try:
+        with translate_exceptions():
             instance = self.compute_api.get(context, id)
             method(context, instance, group_name)
-        except exception.SecurityGroupNotFound as exp:
-            raise exc.HTTPNotFound(explanation=exp.format_message())
-        except exception.InstanceNotFound as exp:
-            raise exc.HTTPNotFound(explanation=exp.format_message())
-        except exception.Invalid as exp:
-            raise exc.HTTPBadRequest(explanation=exp.format_message())
 
         return webob.Response(status_int=202)
 
@@ -642,15 +648,15 @@ class Security_groups(extensions.ExtensionDescriptor):
 class NativeSecurityGroupExceptions(object):
     @staticmethod
     def raise_invalid_property(msg):
-        raise exc.HTTPBadRequest(explanation=msg)
+        raise exception.Invalid(msg)
 
     @staticmethod
     def raise_group_already_exists(msg):
-        raise exc.HTTPBadRequest(explanation=msg)
+        raise exception.Invalid(msg)
 
     @staticmethod
     def raise_invalid_group(msg):
-        raise exc.HTTPBadRequest(explanation=msg)
+        raise exception.Invalid(msg)
 
     @staticmethod
     def raise_invalid_cidr(cidr, decoding_exception=None):
@@ -662,7 +668,7 @@ class NativeSecurityGroupExceptions(object):
 
     @staticmethod
     def raise_not_found(msg):
-        raise exc.HTTPNotFound(explanation=msg)
+        raise exception.SecurityGroupNotFound(msg)
 
 
 class NativeNovaSecurityGroupAPI(NativeSecurityGroupExceptions,
diff --git a/nova/api/openstack/compute/contrib/server_password.py b/nova/api/openstack/compute/contrib/server_password.py
index 14ea91ef2..2884e4040 100644
--- a/nova/api/openstack/compute/contrib/server_password.py
+++ b/nova/api/openstack/compute/contrib/server_password.py
@@ -39,7 +39,7 @@ class ServerPasswordTemplate(xmlutil.TemplateBuilder):
 
 
 class ServerPasswordController(object):
-    """The flavor access API controller for the OpenStack API."""
+    """The Server Password API controller for the OpenStack API."""
     def __init__(self):
         self.compute_api = compute.API()
 
diff --git a/nova/api/openstack/compute/contrib/server_start_stop.py b/nova/api/openstack/compute/contrib/server_start_stop.py
index 2803cd04b..1734b2cfa 100644
--- a/nova/api/openstack/compute/contrib/server_start_stop.py
+++ b/nova/api/openstack/compute/contrib/server_start_stop.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 import webob
 
diff --git a/nova/api/openstack/compute/contrib/used_limits.py b/nova/api/openstack/compute/contrib/used_limits.py
index 5a90a9def..a0fab1594 100644
--- a/nova/api/openstack/compute/contrib/used_limits.py
+++ b/nova/api/openstack/compute/contrib/used_limits.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
diff --git a/nova/api/openstack/compute/contrib/used_limits_for_admin.py b/nova/api/openstack/compute/contrib/used_limits_for_admin.py
index a6ec9c002..d2a8af0d7 100644
--- a/nova/api/openstack/compute/contrib/used_limits_for_admin.py
+++ b/nova/api/openstack/compute/contrib/used_limits_for_admin.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 
diff --git a/nova/api/openstack/compute/contrib/user_data.py b/nova/api/openstack/compute/contrib/user_data.py
index 3e69a65cc..ef5aa6d5a 100644
--- a/nova/api/openstack/compute/contrib/user_data.py
+++ b/nova/api/openstack/compute/contrib/user_data.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 from nova.api.openstack import extensions
 
diff --git a/nova/api/openstack/compute/flavors.py b/nova/api/openstack/compute/flavors.py
index 4da130e9b..c6303646a 100644
--- a/nova/api/openstack/compute/flavors.py
+++ b/nova/api/openstack/compute/flavors.py
@@ -24,6 +24,7 @@ from nova.api.openstack import xmlutil
 from nova.compute import flavors
 from nova import exception
 from nova.openstack.common import strutils
+from nova import utils
 
 
 def make_flavor(elem, detailed=False):
@@ -98,7 +99,7 @@ class Controller(wsgi.Controller):
         if is_public is None:
             # preserve default value of showing only public flavors
             return True
-        elif is_public == 'none':
+        elif utils.is_none_string(is_public):
             return None
         else:
             try:
diff --git a/nova/api/openstack/compute/limits.py b/nova/api/openstack/compute/limits.py
index 07e791306..107f40436 100644
--- a/nova/api/openstack/compute/limits.py
+++ b/nova/api/openstack/compute/limits.py
@@ -33,19 +33,13 @@ from nova.api.openstack import xmlutil
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
 from nova import quota
+from nova import utils
 from nova import wsgi as base_wsgi
 
 
 QUOTAS = quota.QUOTAS
 
 
-# Convenience constants for the limits dictionary passed to Limiter().
-PER_SECOND = 1
-PER_MINUTE = 60
-PER_HOUR = 60 * 60
-PER_DAY = 60 * 60 * 24
-
-
 limits_nsmap = {None: xmlutil.XMLNS_COMMON_V10, 'atom': xmlutil.XMLNS_ATOM}
 
 
@@ -122,14 +116,7 @@ class Limit(object):
     Stores information about a limit for HTTP requests.
     """
 
-    UNITS = {
-        1: "SECOND",
-        60: "MINUTE",
-        60 * 60: "HOUR",
-        60 * 60 * 24: "DAY",
-    }
-
-    UNIT_MAP = dict([(v, k) for k, v in UNITS.items()])
+    UNITS = dict([(v, k) for k, v in utils.TIME_UNITS.items()])
 
     def __init__(self, verb, uri, regex, value, unit):
         """
@@ -223,12 +210,13 @@ class Limit(object):
 # a regular-expression to match, value and unit of measure (PER_DAY, etc.)
 
 DEFAULT_LIMITS = [
-    Limit("POST", "*", ".*", 10, PER_MINUTE),
-    Limit("POST", "*/servers", "^/servers", 50, PER_DAY),
-    Limit("PUT", "*", ".*", 10, PER_MINUTE),
-    Limit("GET", "*changes-since*", ".*changes-since.*", 3, PER_MINUTE),
-    Limit("DELETE", "*", ".*", 100, PER_MINUTE),
-    Limit("GET", "*/os-fping", "^/os-fping", 12, PER_HOUR),
+    Limit("POST", "*", ".*", 10, utils.TIME_UNITS['MINUTE']),
+    Limit("POST", "*/servers", "^/servers", 50, utils.TIME_UNITS['DAY']),
+    Limit("PUT", "*", ".*", 10, utils.TIME_UNITS['MINUTE']),
+    Limit("GET", "*changes-since*", ".*changes-since.*", 3,
+          utils.TIME_UNITS['MINUTE']),
+    Limit("DELETE", "*", ".*", 100, utils.TIME_UNITS['MINUTE']),
+    Limit("GET", "*/os-fping", "^/os-fping", 12, utils.TIME_UNITS['HOUR']),
 ]
 
 
@@ -390,9 +378,9 @@ class Limiter(object):
 
             # Convert unit
             unit = unit.upper()
-            if unit not in Limit.UNIT_MAP:
+            if unit not in utils.TIME_UNITS:
                 raise ValueError("Invalid units specified")
-            unit = Limit.UNIT_MAP[unit]
+            unit = utils.TIME_UNITS[unit]
 
             # Build a limit
             result.append(Limit(verb, uri, regex, value, unit))
diff --git a/nova/api/openstack/compute/plugins/v3/agents.py b/nova/api/openstack/compute/plugins/v3/agents.py
new file mode 100644
index 000000000..02e752dac
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/agents.py
@@ -0,0 +1,168 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 IBM Corp.
+#
+#    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 webob.exc
+
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+from nova import db
+from nova import exception
+
+
+authorize = extensions.extension_authorizer('compute', 'agents')
+
+
+class AgentsIndexTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('agents')
+        elem = xmlutil.SubTemplateElement(root, 'agent', selector='agents')
+        elem.set('hypervisor')
+        elem.set('os')
+        elem.set('architecture')
+        elem.set('version')
+        elem.set('md5hash')
+        elem.set('agent_id')
+        elem.set('url')
+
+        return xmlutil.MasterTemplate(root, 1)
+
+
+class AgentController(object):
+    """
+    The agent is talking about guest agent.The host can use this for
+    things like accessing files on the disk, configuring networking,
+    or running other applications/scripts in the guest while it is
+    running. Typically this uses some hypervisor-specific transport
+    to avoid being dependent on a working network configuration.
+    Xen, VMware, and VirtualBox have guest agents,although the Xen
+    driver is the only one with an implementation for managing them
+    in openstack. KVM doesn't really have a concept of a guest agent
+    (although one could be written).
+
+    You can find the design of agent update in this link:
+    http://wiki.openstack.org/AgentUpdate
+    and find the code in nova.virt.xenapi.vmops.VMOps._boot_new_instance.
+    In this design We need update agent in guest from host, so we need
+    some interfaces to update the agent info in host.
+
+    You can find more information about the design of the GuestAgent in
+    the following link:
+    http://wiki.openstack.org/GuestAgent
+    http://wiki.openstack.org/GuestAgentXenStoreCommunication
+    """
+    @wsgi.serializers(xml=AgentsIndexTemplate)
+    def index(self, req):
+        """
+        Return a list of all agent builds. Filter by hypervisor.
+        """
+        context = req.environ['nova.context']
+        authorize(context)
+        hypervisor = None
+        agents = []
+        if 'hypervisor' in req.GET:
+            hypervisor = req.GET['hypervisor']
+
+        for agent_build in db.agent_build_get_all(context, hypervisor):
+            agents.append({'hypervisor': agent_build.hypervisor,
+                           'os': agent_build.os,
+                           'architecture': agent_build.architecture,
+                           'version': agent_build.version,
+                           'md5hash': agent_build.md5hash,
+                           'agent_id': agent_build.id,
+                           'url': agent_build.url})
+
+        return {'agents': agents}
+
+    def update(self, req, id, body):
+        """Update an existing agent build."""
+        context = req.environ['nova.context']
+        authorize(context)
+
+        try:
+            para = body['para']
+            url = para['url']
+            md5hash = para['md5hash']
+            version = para['version']
+        except (TypeError, KeyError):
+            raise webob.exc.HTTPUnprocessableEntity()
+
+        try:
+            db.agent_build_update(context, id,
+                                {'version': version,
+                                 'url': url,
+                                 'md5hash': md5hash})
+        except exception.AgentBuildNotFound as ex:
+            raise webob.exc.HTTPNotFound(explanation=ex.format_message())
+
+        return {"agent": {'agent_id': id, 'version': version,
+                'url': url, 'md5hash': md5hash}}
+
+    def delete(self, req, id):
+        """Deletes an existing agent build."""
+        context = req.environ['nova.context']
+        authorize(context)
+
+        try:
+            db.agent_build_destroy(context, id)
+        except exception.AgentBuildNotFound as ex:
+            raise webob.exc.HTTPNotFound(explanation=ex.format_message())
+
+    def create(self, req, body):
+        """Creates a new agent build."""
+        context = req.environ['nova.context']
+        authorize(context)
+
+        try:
+            agent = body['agent']
+            hypervisor = agent['hypervisor']
+            os = agent['os']
+            architecture = agent['architecture']
+            version = agent['version']
+            url = agent['url']
+            md5hash = agent['md5hash']
+        except (TypeError, KeyError):
+            raise webob.exc.HTTPUnprocessableEntity()
+
+        try:
+            agent_build_ref = db.agent_build_create(context,
+                                                {'hypervisor': hypervisor,
+                                                 'os': os,
+                                                 'architecture': architecture,
+                                                 'version': version,
+                                                 'url': url,
+                                                 'md5hash': md5hash})
+            agent['agent_id'] = agent_build_ref.id
+        except Exception as ex:
+            raise webob.exc.HTTPServerError(str(ex))
+        return {'agent': agent}
+
+
+class Agents(extensions.ExtensionDescriptor):
+    """Agents support."""
+
+    name = "Agents"
+    alias = "os-agents"
+    namespace = "http://docs.openstack.org/compute/ext/agents/api/v2"
+    updated = "2012-10-28T00:00:00-00:00"
+
+    def get_resources(self):
+        resources = []
+        resource = extensions.ResourceExtension('os-agents',
+                                                AgentController())
+        resources.append(resource)
+        return resources
diff --git a/nova/api/openstack/compute/plugins/v3/evacuate.py b/nova/api/openstack/compute/plugins/v3/evacuate.py
new file mode 100644
index 000000000..86e90e03e
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/evacuate.py
@@ -0,0 +1,101 @@
+#   Copyright 2013 OpenStack Foundation
+#
+#   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.
+
+
+from webob import exc
+
+from nova.api.openstack import common
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova import compute
+from nova import exception
+from nova.openstack.common import log as logging
+from nova.openstack.common import strutils
+from nova import utils
+
+LOG = logging.getLogger(__name__)
+ALIAS = "os-evacuate"
+authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
+
+
+class EvacuateController(wsgi.Controller):
+    def __init__(self, *args, **kwargs):
+        super(EvacuateController, self).__init__(*args, **kwargs)
+        self.compute_api = compute.API()
+
+    @wsgi.action('evacuate')
+    def _evacuate(self, req, id, body):
+        """
+        Permit admins to evacuate a server from a failed host
+        to a new one.
+        """
+        context = req.environ["nova.context"]
+        authorize(context)
+
+        try:
+            if len(body) != 1:
+                raise exc.HTTPBadRequest(_("Malformed request body"))
+
+            evacuate_body = body["evacuate"]
+            host = evacuate_body["host"]
+            on_shared_storage = strutils.bool_from_string(
+                                            evacuate_body["onSharedStorage"])
+
+            password = None
+            if 'adminPass' in evacuate_body:
+                # check that if requested to evacuate server on shared storage
+                # password not specified
+                if on_shared_storage:
+                    msg = _("admin password can't be changed on existing disk")
+                    raise exc.HTTPBadRequest(explanation=msg)
+
+                password = evacuate_body['adminPass']
+            elif not on_shared_storage:
+                password = utils.generate_password()
+
+        except (TypeError, KeyError):
+            msg = _("host and onSharedStorage must be specified.")
+            raise exc.HTTPBadRequest(explanation=msg)
+
+        try:
+            instance = self.compute_api.get(context, id)
+            self.compute_api.evacuate(context, instance, host,
+                                      on_shared_storage, password)
+        except exception.InstanceInvalidState as state_error:
+            common.raise_http_conflict_for_instance_invalid_state(state_error,
+                    'evacuate')
+        except Exception as e:
+            msg = _("Error in evacuate, %s") % e
+            LOG.exception(msg, instance=instance)
+            raise exc.HTTPBadRequest(explanation=msg)
+
+        if password:
+            return {'adminPass': password}
+
+
+class Evacuate(extensions.V3APIExtensionBase):
+    """Enables server evacuation."""
+
+    name = "Evacuate"
+    alias = ALIAS
+    namespace = "http://docs.openstack.org/compute/ext/evacuate/api/v3"
+    version = 1
+
+    def get_resources(self):
+        return []
+
+    def get_controller_extensions(self):
+        controller = EvacuateController()
+        extension = extensions.ControllerExtension(self, 'servers', controller)
+        return [extension]
diff --git a/nova/api/openstack/compute/plugins/v3/extension_info.py b/nova/api/openstack/compute/plugins/v3/extension_info.py
index 43b0551c7..c626f6104 100644
--- a/nova/api/openstack/compute/plugins/v3/extension_info.py
+++ b/nova/api/openstack/compute/plugins/v3/extension_info.py
@@ -19,6 +19,10 @@ import webob.exc
 from nova.api.openstack import extensions
 from nova.api.openstack import wsgi
 from nova.api.openstack import xmlutil
+from nova.openstack.common import log as logging
+
+
+LOG = logging.getLogger(__name__)
 
 
 def make_ext(elem):
@@ -64,11 +68,25 @@ class ExtensionInfoController(object):
         ext_data['version'] = ext.version
         return ext_data
 
+    def _get_extensions(self, context):
+        """Filter extensions list based on policy"""
+
+        discoverable_extensions = dict()
+        for alias, ext in self.extension_info.get_extensions().iteritems():
+            authorize = extensions.soft_extension_authorizer(
+                'compute', 'v3:' + alias)
+            if authorize(context, action='discoverable'):
+                discoverable_extensions[alias] = ext
+            else:
+                LOG.debug(_("Filter out extension %s from discover list"), alias)
+        return discoverable_extensions
+
     @wsgi.serializers(xml=ExtensionsTemplate)
     def index(self, req):
+        context = req.environ['nova.context']
 
         sorted_ext_list = sorted(
-            self.extension_info.get_extensions().iteritems())
+            self._get_extensions(context).iteritems())
 
         extensions = []
         for _alias, ext in sorted_ext_list:
@@ -77,9 +95,10 @@ class ExtensionInfoController(object):
 
     @wsgi.serializers(xml=ExtensionTemplate)
     def show(self, req, id):
+        context = req.environ['nova.context']
         try:
             # NOTE(dprince): the extensions alias is used as the 'id' for show
-            ext = self.extension_info.get_extensions()[id]
+            ext = self._get_extensions(context)[id]
         except KeyError:
             raise webob.exc.HTTPNotFound()
 
diff --git a/nova/api/openstack/compute/plugins/v3/fixed_ips.py b/nova/api/openstack/compute/plugins/v3/fixed_ips.py
index e98b830bd..5fa4ae3c2 100644
--- a/nova/api/openstack/compute/plugins/v3/fixed_ips.py
+++ b/nova/api/openstack/compute/plugins/v3/fixed_ips.py
@@ -28,6 +28,7 @@ authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
 
 
 class FixedIPController(object):
+    @extensions.expected_errors(404)
     def show(self, req, id):
         """Return data about the given fixed ip."""
         context = req.environ['nova.context']
@@ -55,6 +56,7 @@ class FixedIPController(object):
 
         return fixed_ip_info
 
+    @extensions.expected_errors((400, 404))
     def action(self, req, id, body):
         context = req.environ['nova.context']
         authorize(context)
diff --git a/nova/api/openstack/compute/plugins/v3/flavor_access.py b/nova/api/openstack/compute/plugins/v3/flavor_access.py
new file mode 100644
index 000000000..459a4041b
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/flavor_access.py
@@ -0,0 +1,220 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright (c) 2011 OpenStack Foundation
+# 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.
+
+"""The flavor access extension."""
+
+import webob
+
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+from nova.compute import flavors
+from nova import exception
+
+ALIAS = 'os-flavor-access'
+authorize = extensions.soft_extension_authorizer('compute', 'v3:' + ALIAS)
+
+
+def make_flavor(elem):
+    elem.set('{%s}is_public' % FlavorAccess.namespace,
+             '%s:is_public' % FlavorAccess.alias)
+
+
+def make_flavor_access(elem):
+    elem.set('flavor_id')
+    elem.set('tenant_id')
+
+
+class FlavorTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('flavor', selector='flavor')
+        make_flavor(root)
+        alias = FlavorAccess.alias
+        namespace = FlavorAccess.namespace
+        return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
+
+
+class FlavorsTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('flavors')
+        elem = xmlutil.SubTemplateElement(root, 'flavor', selector='flavors')
+        make_flavor(elem)
+        alias = FlavorAccess.alias
+        namespace = FlavorAccess.namespace
+        return xmlutil.SlaveTemplate(root, 1, nsmap={alias: namespace})
+
+
+class FlavorAccessTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('flavor_access')
+        elem = xmlutil.SubTemplateElement(root, 'access',
+                                          selector='flavor_access')
+        make_flavor_access(elem)
+        return xmlutil.MasterTemplate(root, 1)
+
+
+def _marshall_flavor_access(flavor_id):
+    rval = []
+    try:
+        access_list = flavors.\
+                      get_flavor_access_by_flavor_id(flavor_id)
+    except exception.FlavorNotFound:
+        explanation = _("Flavor not found.")
+        raise webob.exc.HTTPNotFound(explanation=explanation)
+
+    for access in access_list:
+        rval.append({'flavor_id': flavor_id,
+                     'tenant_id': access['project_id']})
+
+    return {'flavor_access': rval}
+
+
+class FlavorAccessController(object):
+    """The flavor access API controller for the OpenStack API."""
+
+    def __init__(self):
+        super(FlavorAccessController, self).__init__()
+
+    @wsgi.serializers(xml=FlavorAccessTemplate)
+    def index(self, req, flavor_id):
+        context = req.environ['nova.context']
+        authorize(context)
+
+        try:
+            flavor = flavors.get_flavor_by_flavor_id(flavor_id)
+        except exception.FlavorNotFound:
+            explanation = _("Flavor not found.")
+            raise webob.exc.HTTPNotFound(explanation=explanation)
+
+        # public flavor to all projects
+        if flavor['is_public']:
+            explanation = _("Access list not available for public flavors.")
+            raise webob.exc.HTTPNotFound(explanation=explanation)
+
+        # private flavor to listed projects only
+        return _marshall_flavor_access(flavor_id)
+
+
+class FlavorActionController(wsgi.Controller):
+    """The flavor access API controller for the OpenStack API."""
+
+    def _check_body(self, body):
+        if body is None or body == "":
+            raise webob.exc.HTTPBadRequest(explanation=_("No request body"))
+
+    def _get_flavor_refs(self, context):
+        """Return a dictionary mapping flavorid to flavor_ref."""
+
+        flavor_refs = flavors.get_all_flavors(context)
+        rval = {}
+        for name, obj in flavor_refs.iteritems():
+            rval[obj['flavorid']] = obj
+        return rval
+
+    def _extend_flavor(self, flavor_rval, flavor_ref):
+        key = "%s:is_public" % (FlavorAccess.alias)
+        flavor_rval[key] = flavor_ref['is_public']
+
+    @wsgi.extends
+    def show(self, req, resp_obj, id):
+        context = req.environ['nova.context']
+        if authorize(context):
+            # Attach our slave template to the response object
+            resp_obj.attach(xml=FlavorTemplate())
+            db_flavor = req.get_db_flavor(id)
+
+            self._extend_flavor(resp_obj.obj['flavor'], db_flavor)
+
+    @wsgi.extends
+    def detail(self, req, resp_obj):
+        context = req.environ['nova.context']
+        if authorize(context):
+            # Attach our slave template to the response object
+            resp_obj.attach(xml=FlavorsTemplate())
+
+            flavors = list(resp_obj.obj['flavors'])
+            for flavor_rval in flavors:
+                db_flavor = req.get_db_flavor(flavor_rval['id'])
+                self._extend_flavor(flavor_rval, db_flavor)
+
+    @wsgi.extends(action='create')
+    def create(self, req, body, resp_obj):
+        context = req.environ['nova.context']
+        if authorize(context):
+            # Attach our slave template to the response object
+            resp_obj.attach(xml=FlavorTemplate())
+
+            db_flavor = req.get_db_flavor(resp_obj.obj['flavor']['id'])
+
+            self._extend_flavor(resp_obj.obj['flavor'], db_flavor)
+
+    @wsgi.serializers(xml=FlavorAccessTemplate)
+    @wsgi.action("addTenantAccess")
+    def _addTenantAccess(self, req, id, body):
+        context = req.environ['nova.context']
+        authorize(context)
+        self._check_body(body)
+
+        vals = body['addTenantAccess']
+        tenant = vals['tenant']
+
+        try:
+            flavors.add_flavor_access(id, tenant, context)
+        except exception.FlavorAccessExists as err:
+            raise webob.exc.HTTPConflict(explanation=err.format_message())
+
+        return _marshall_flavor_access(id)
+
+    @wsgi.serializers(xml=FlavorAccessTemplate)
+    @wsgi.action("removeTenantAccess")
+    def _removeTenantAccess(self, req, id, body):
+        context = req.environ['nova.context']
+        authorize(context)
+        self._check_body(body)
+
+        vals = body['removeTenantAccess']
+        tenant = vals['tenant']
+
+        try:
+            flavors.remove_flavor_access(id, tenant, context)
+        except exception.FlavorAccessNotFound as e:
+            raise webob.exc.HTTPNotFound(explanation=e.format_message())
+
+        return _marshall_flavor_access(id)
+
+
+class FlavorAccess(extensions.V3APIExtensionBase):
+    """Flavor access support."""
+
+    name = "FlavorAccess"
+    alias = ALIAS
+    namespace = "http://docs.openstack.org/compute/ext/%s/api/v3" % ALIAS
+    version = 1
+
+    def get_resources(self):
+        res = extensions.ResourceExtension(
+            ALIAS,
+            controller=FlavorAccessController(),
+            parent=dict(member_name='flavor', collection_name='flavors'))
+
+        return [res]
+
+    def get_controller_extensions(self):
+        extension = extensions.ControllerExtension(
+                self, 'flavors', FlavorActionController())
+
+        return [extension]
diff --git a/nova/api/openstack/compute/plugins/v3/flavors.py b/nova/api/openstack/compute/plugins/v3/flavors.py
new file mode 100644
index 000000000..733ff3750
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/flavors.py
@@ -0,0 +1,167 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2010 OpenStack Foundation
+# 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 webob
+
+from nova.api.openstack import common
+from nova.api.openstack.compute.views import flavors as flavors_view
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+from nova.compute import flavors
+from nova import exception
+from nova.openstack.common import strutils
+
+
+def make_flavor(elem, detailed=False):
+    elem.set('name')
+    elem.set('id')
+    if detailed:
+        elem.set('ram')
+        elem.set('disk')
+        elem.set('vcpus', xmlutil.EmptyStringSelector('vcpus'))
+
+    xmlutil.make_links(elem, 'links')
+
+
+flavor_nsmap = {None: xmlutil.XMLNS_V11, 'atom': xmlutil.XMLNS_ATOM}
+
+
+class FlavorTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('flavor', selector='flavor')
+        make_flavor(root, detailed=True)
+        return xmlutil.MasterTemplate(root, 1, nsmap=flavor_nsmap)
+
+
+class MinimalFlavorsTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('flavors')
+        elem = xmlutil.SubTemplateElement(root, 'flavor', selector='flavors')
+        make_flavor(elem)
+        return xmlutil.MasterTemplate(root, 1, nsmap=flavor_nsmap)
+
+
+class FlavorsTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('flavors')
+        elem = xmlutil.SubTemplateElement(root, 'flavor', selector='flavors')
+        make_flavor(elem, detailed=True)
+        return xmlutil.MasterTemplate(root, 1, nsmap=flavor_nsmap)
+
+
+class FlavorsController(wsgi.Controller):
+    """Flavor controller for the OpenStack API."""
+
+    _view_builder_class = flavors_view.ViewBuilder
+
+    @wsgi.serializers(xml=MinimalFlavorsTemplate)
+    def index(self, req):
+        """Return all flavors in brief."""
+        limited_flavors = self._get_flavors(req)
+        return self._view_builder.index(req, limited_flavors)
+
+    @wsgi.serializers(xml=FlavorsTemplate)
+    def detail(self, req):
+        """Return all flavors in detail."""
+        limited_flavors = self._get_flavors(req)
+        req.cache_db_flavors(limited_flavors)
+        return self._view_builder.detail(req, limited_flavors)
+
+    @wsgi.serializers(xml=FlavorTemplate)
+    def show(self, req, id):
+        """Return data about the given flavor id."""
+        try:
+            flavor = flavors.get_flavor_by_flavor_id(id)
+            req.cache_db_flavor(flavor)
+        except exception.NotFound:
+            raise webob.exc.HTTPNotFound()
+
+        return self._view_builder.show(req, flavor)
+
+    def _parse_is_public(self, is_public):
+        """Parse is_public into something usable."""
+
+        if is_public is None:
+            # preserve default value of showing only public flavors
+            return True
+        elif is_public == 'none':
+            return None
+        else:
+            try:
+                return strutils.bool_from_string(is_public, strict=True)
+            except ValueError:
+                msg = _('Invalid is_public filter [%s]') % is_public
+                raise webob.exc.HTTPBadRequest(explanation=msg)
+
+    def _get_flavors(self, req):
+        """Helper function that returns a list of flavor dicts."""
+        filters = {}
+
+        context = req.environ['nova.context']
+        if context.is_admin:
+            # Only admin has query access to all flavor types
+            filters['is_public'] = self._parse_is_public(
+                    req.params.get('is_public', None))
+        else:
+            filters['is_public'] = True
+            filters['disabled'] = False
+
+        if 'minRam' in req.params:
+            try:
+                filters['min_memory_mb'] = int(req.params['minRam'])
+            except ValueError:
+                msg = _('Invalid minRam filter [%s]') % req.params['minRam']
+                raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        if 'minDisk' in req.params:
+            try:
+                filters['min_root_gb'] = int(req.params['minDisk'])
+            except ValueError:
+                msg = _('Invalid minDisk filter [%s]') % req.params['minDisk']
+                raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        limited_flavors = flavors.get_all_flavors(context, filters=filters)
+        flavors_list = limited_flavors.values()
+        sorted_flavors = sorted(flavors_list,
+                                key=lambda item: item['flavorid'])
+        limited_flavors = common.limited_by_marker(sorted_flavors, req)
+        return limited_flavors
+
+
+class Flavors(extensions.V3APIExtensionBase):
+    """ Flavors Extension. """
+    name = "flavors"
+    alias = "flavors"
+    namespace = "http://docs.openstack.org/compute/core/flavors/v3"
+    version = 1
+
+    def get_resources(self):
+        collection_actions = {'detail': 'GET'}
+        member_actions = {'action': 'POST'}
+
+        resources = [
+            extensions.ResourceExtension('flavors',
+                                         FlavorsController(),
+                                         member_name='flavor',
+                                         collection_actions=collection_actions,
+                                         member_actions=member_actions)
+            ]
+        return resources
+
+    def get_controller_extensions(self):
+        return []
diff --git a/nova/api/openstack/compute/plugins/v3/keypairs.py b/nova/api/openstack/compute/plugins/v3/keypairs.py
index bf740641e..ab40b051c 100644
--- a/nova/api/openstack/compute/plugins/v3/keypairs.py
+++ b/nova/api/openstack/compute/plugins/v3/keypairs.py
@@ -55,6 +55,7 @@ class KeypairController(object):
         self.api = compute_api.KeypairAPI()
 
     @wsgi.serializers(xml=KeypairTemplate)
+    @extensions.expected_errors((400, 409, 413))
     def create(self, req, body):
         """
         Create or import keypair.
@@ -100,6 +101,7 @@ class KeypairController(object):
         except exception.KeyPairExists as exc:
             raise webob.exc.HTTPConflict(explanation=exc.format_message())
 
+    @extensions.expected_errors(404)
     def delete(self, req, id):
         """
         Delete a keypair with a given name
@@ -113,6 +115,7 @@ class KeypairController(object):
         return webob.Response(status_int=202)
 
     @wsgi.serializers(xml=KeypairTemplate)
+    @extensions.expected_errors(404)
     def show(self, req, id):
         """Return data for the given key name."""
         context = req.environ['nova.context']
diff --git a/nova/api/openstack/compute/plugins/v3/quota_classes.py b/nova/api/openstack/compute/plugins/v3/quota_classes.py
new file mode 100644
index 000000000..361748df8
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/quota_classes.py
@@ -0,0 +1,103 @@
+# Copyright 2012 OpenStack Foundation
+# 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 webob
+
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+import nova.context
+from nova import db
+from nova import exception
+from nova import quota
+
+
+QUOTAS = quota.QUOTAS
+
+
+authorize = extensions.extension_authorizer('compute', 'quota_classes')
+
+
+class QuotaClassTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('quota_class_set',
+                                       selector='quota_class_set')
+        root.set('id')
+
+        for resource in QUOTAS.resources:
+            elem = xmlutil.SubTemplateElement(root, resource)
+            elem.text = resource
+
+        return xmlutil.MasterTemplate(root, 1)
+
+
+class QuotaClassSetsController(object):
+
+    def _format_quota_set(self, quota_class, quota_set):
+        """Convert the quota object to a result dict."""
+
+        result = dict(id=str(quota_class))
+
+        for resource in QUOTAS.resources:
+            result[resource] = quota_set[resource]
+
+        return dict(quota_class_set=result)
+
+    @wsgi.serializers(xml=QuotaClassTemplate)
+    def show(self, req, id):
+        context = req.environ['nova.context']
+        authorize(context)
+        try:
+            nova.context.authorize_quota_class_context(context, id)
+            return self._format_quota_set(id,
+                                          QUOTAS.get_class_quotas(context, id))
+        except exception.NotAuthorized:
+            raise webob.exc.HTTPForbidden()
+
+    @wsgi.serializers(xml=QuotaClassTemplate)
+    def update(self, req, id, body):
+        context = req.environ['nova.context']
+        authorize(context)
+        quota_class = id
+        for key in body['quota_class_set'].keys():
+            if key in QUOTAS:
+                value = int(body['quota_class_set'][key])
+                try:
+                    db.quota_class_update(context, quota_class, key, value)
+                except exception.QuotaClassNotFound:
+                    db.quota_class_create(context, quota_class, key, value)
+                except exception.AdminRequired:
+                    raise webob.exc.HTTPForbidden()
+        return {'quota_class_set': QUOTAS.get_class_quotas(context,
+                                                           quota_class)}
+
+
+class Quota_classes(extensions.ExtensionDescriptor):
+    """Quota classes management support."""
+
+    name = "QuotaClasses"
+    alias = "os-quota-class-sets"
+    namespace = ("http://docs.openstack.org/compute/ext/"
+                 "quota-classes-sets/api/v1.1")
+    updated = "2012-03-12T00:00:00+00:00"
+
+    def get_resources(self):
+        resources = []
+
+        res = extensions.ResourceExtension('os-quota-class-sets',
+                                           QuotaClassSetsController())
+        resources.append(res)
+
+        return resources
diff --git a/nova/api/openstack/compute/plugins/v3/quota_sets.py b/nova/api/openstack/compute/plugins/v3/quota_sets.py
new file mode 100644
index 000000000..67af5d127
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/quota_sets.py
@@ -0,0 +1,214 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack Foundation
+# 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 webob
+
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova.api.openstack import xmlutil
+import nova.context
+from nova import db
+from nova import exception
+from nova.openstack.common import log as logging
+from nova.openstack.common import strutils
+from nova import quota
+
+
+ALIAS = "os-quota-sets"
+QUOTAS = quota.QUOTAS
+LOG = logging.getLogger(__name__)
+NON_QUOTA_KEYS = ['tenant_id', 'id', 'force']
+
+
+authorize_update = extensions.extension_authorizer('compute',
+                                                   'v3:%s:update' % ALIAS)
+authorize_show = extensions.extension_authorizer('compute',
+                                                 'v3:%s:show' % ALIAS)
+authorize_delete = extensions.extension_authorizer('compute',
+                                                   'v3:%s:delete' % ALIAS)
+
+
+class QuotaTemplate(xmlutil.TemplateBuilder):
+    def construct(self):
+        root = xmlutil.TemplateElement('quota_set', selector='quota_set')
+        root.set('id')
+
+        for resource in QUOTAS.resources:
+            elem = xmlutil.SubTemplateElement(root, resource)
+            elem.text = resource
+
+        return xmlutil.MasterTemplate(root, 1)
+
+
+class QuotaSetsController(object):
+
+    def __init__(self, ext_mgr):
+        self.ext_mgr = ext_mgr
+
+    def _format_quota_set(self, project_id, quota_set):
+        """Convert the quota object to a result dict."""
+
+        result = dict(id=str(project_id))
+
+        for resource in QUOTAS.resources:
+            result[resource] = quota_set[resource]
+
+        return dict(quota_set=result)
+
+    def _validate_quota_limit(self, limit):
+        # NOTE: -1 is a flag value for unlimited
+        if limit < -1:
+            msg = _("Quota limit must be -1 or greater.")
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+    def _get_quotas(self, context, id, usages=False):
+        values = QUOTAS.get_project_quotas(context, id, usages=usages)
+
+        if usages:
+            return values
+        else:
+            return dict((k, v['limit']) for k, v in values.items())
+
+    @wsgi.serializers(xml=QuotaTemplate)
+    def show(self, req, id):
+        context = req.environ['nova.context']
+        authorize_show(context)
+        try:
+            nova.context.authorize_project_context(context, id)
+            return self._format_quota_set(id, self._get_quotas(context, id))
+        except exception.NotAuthorized:
+            raise webob.exc.HTTPForbidden()
+
+    @wsgi.serializers(xml=QuotaTemplate)
+    def update(self, req, id, body):
+        context = req.environ['nova.context']
+        authorize_update(context)
+        project_id = id
+
+        bad_keys = []
+
+        # By default, we can force update the quota if the extended
+        # is not loaded
+        force_update = True
+        extended_loaded = False
+        if self.ext_mgr.is_loaded('os-extended-quotas'):
+            # force optional has been enabled, the default value of
+            # force_update need to be changed to False
+            extended_loaded = True
+            force_update = False
+
+        for key, value in body['quota_set'].items():
+            if (key not in QUOTAS and
+                    key not in NON_QUOTA_KEYS):
+                bad_keys.append(key)
+                continue
+            if key == 'force' and extended_loaded:
+                # only check the force optional when the extended has
+                # been loaded
+                force_update = strutils.bool_from_string(value)
+            elif key not in NON_QUOTA_KEYS and value:
+                try:
+                    value = int(value)
+                except (ValueError, TypeError):
+                    msg = _("Quota '%(value)s' for %(key)s should be "
+                            "integer.") % locals()
+                    LOG.warn(msg)
+                    raise webob.exc.HTTPBadRequest(explanation=msg)
+                self._validate_quota_limit(value)
+
+        LOG.debug(_("force update quotas: %s") % force_update)
+
+        if len(bad_keys) > 0:
+            msg = _("Bad key(s) %s in quota_set") % ",".join(bad_keys)
+            raise webob.exc.HTTPBadRequest(explanation=msg)
+
+        try:
+            project_quota = self._get_quotas(context, id, True)
+        except exception.NotAuthorized:
+            raise webob.exc.HTTPForbidden()
+
+        for key, value in body['quota_set'].items():
+            if key in NON_QUOTA_KEYS or not value:
+                continue
+            # validate whether already used and reserved exceeds the new
+            # quota, this check will be ignored if admin want to force
+            # update
+            value = int(value)
+            if force_update is not True and value >= 0:
+                quota_value = project_quota.get(key)
+                if quota_value and quota_value['limit'] >= 0:
+                    quota_used = (quota_value['in_use'] +
+                                  quota_value['reserved'])
+                    LOG.debug(_("Quota %(key)s used: %(quota_used)s, "
+                                "value: %(value)s."),
+                              {'key': key, 'quota_used': quota_used,
+                               'value': value})
+                    if quota_used > value:
+                        msg = (_("Quota value %(value)s for %(key)s are "
+                                "greater than already used and reserved "
+                                "%(quota_used)s") %
+                                {'value': value, 'key': key,
+                                 'quota_used': quota_used})
+                        raise webob.exc.HTTPBadRequest(explanation=msg)
+
+            try:
+                db.quota_update(context, project_id, key, value)
+            except exception.ProjectQuotaNotFound:
+                db.quota_create(context, project_id, key, value)
+            except exception.AdminRequired:
+                raise webob.exc.HTTPForbidden()
+        return {'quota_set': self._get_quotas(context, id)}
+
+    @wsgi.serializers(xml=QuotaTemplate)
+    def defaults(self, req, id):
+        context = req.environ['nova.context']
+        authorize_show(context)
+        return self._format_quota_set(id, QUOTAS.get_defaults(context))
+
+    def delete(self, req, id):
+        if self.ext_mgr.is_loaded('os-extended-quotas'):
+            context = req.environ['nova.context']
+            authorize_delete(context)
+            try:
+                nova.context.authorize_project_context(context, id)
+                QUOTAS.destroy_all_by_project(context, id)
+                return webob.Response(status_int=202)
+            except exception.NotAuthorized:
+                raise webob.exc.HTTPForbidden()
+        raise webob.exc.HTTPNotFound()
+
+
+class QuotaSets(extensions.V3APIExtensionBase):
+    """Quotas management support."""
+
+    name = "Quotas"
+    alias = ALIAS
+    namespace = "http://docs.openstack.org/compute/ext/os-quotas-sets/api/v3"
+    version = 1
+
+    def get_resources(self):
+        resources = []
+
+        res = extensions.ResourceExtension(ALIAS,
+                                            QuotaSetsController(self.ext_mgr),
+                                            member_actions={'defaults': 'GET'})
+        resources.append(res)
+
+        return resources
+
+    def get_controller_extensions(self):
+        return []
diff --git a/nova/api/openstack/compute/plugins/v3/rescue.py b/nova/api/openstack/compute/plugins/v3/rescue.py
new file mode 100644
index 000000000..ded18bb1a
--- /dev/null
+++ b/nova/api/openstack/compute/plugins/v3/rescue.py
@@ -0,0 +1,100 @@
+#   Copyright 2011 OpenStack Foundation
+#
+#   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.
+
+"""The rescue mode extension."""
+
+from oslo.config import cfg
+import webob
+from webob import exc
+
+from nova.api.openstack import common
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova import compute
+from nova import exception
+from nova import utils
+
+
+ALIAS = "os-rescue"
+CONF = cfg.CONF
+authorize = extensions.extension_authorizer('compute', 'v3:' + ALIAS)
+
+
+class RescueController(wsgi.Controller):
+    def __init__(self, *args, **kwargs):
+        super(RescueController, self).__init__(*args, **kwargs)
+        self.compute_api = compute.API()
+
+    def _get_instance(self, context, instance_id):
+        try:
+            return self.compute_api.get(context, instance_id)
+        except exception.InstanceNotFound:
+            msg = _("Server not found")
+            raise exc.HTTPNotFound(msg)
+
+    @wsgi.action('rescue')
+    def _rescue(self, req, id, body):
+        """Rescue an instance."""
+        context = req.environ["nova.context"]
+        authorize(context)
+
+        if body['rescue'] and 'adminPass' in body['rescue']:
+            password = body['rescue']['adminPass']
+        else:
+            password = utils.generate_password()
+
+        instance = self._get_instance(context, id)
+        try:
+            self.compute_api.rescue(context, instance,
+                                    rescue_password=password)
+        except exception.InstanceInvalidState as state_error:
+            common.raise_http_conflict_for_instance_invalid_state(state_error,
+                                                                  'rescue')
+        except exception.InvalidVolume as volume_error:
+            raise exc.HTTPConflict(explanation=volume_error.format_message())
+        except exception.InstanceNotRescuable as non_rescuable:
+            raise exc.HTTPBadRequest(
+                explanation=non_rescuable.format_message())
+
+        return {'adminPass': password}
+
+    @wsgi.action('unrescue')
+    def _unrescue(self, req, id, body):
+        """Unrescue an instance."""
+        context = req.environ["nova.context"]
+        authorize(context)
+        instance = self._get_instance(context, id)
+        try:
+            self.compute_api.unrescue(context, instance)
+        except exception.InstanceInvalidState as state_error:
+            common.raise_http_conflict_for_instance_invalid_state(state_error,
+                                                                  'unrescue')
+        return webob.Response(status_int=202)
+
+
+class Rescue(extensions.V3APIExtensionBase):
+    """Instance rescue mode."""
+
+    name = "Rescue"
+    alias = ALIAS
+    namespace = "http://docs.openstack.org/compute/ext/rescue/api/v3"
+    version = 1
+
+    def get_resources(self):
+        return []
+
+    def get_controller_extensions(self):
+        controller = RescueController()
+        extension = extensions.ControllerExtension(self, 'servers', controller)
+        return [extension]
diff --git a/nova/api/openstack/extensions.py b/nova/api/openstack/extensions.py
index 6cbc5bb78..69cc87546 100644
--- a/nova/api/openstack/extensions.py
+++ b/nova/api/openstack/extensions.py
@@ -17,6 +17,7 @@
 #    under the License.
 
 import abc
+import functools
 import os
 
 import webob.dec
@@ -392,9 +393,9 @@ def extension_authorizer(api_name, extension_name):
 def soft_extension_authorizer(api_name, extension_name):
     hard_authorize = extension_authorizer(api_name, extension_name)
 
-    def authorize(context):
+    def authorize(context, action=None):
         try:
-            hard_authorize(context)
+            hard_authorize(context, action=action)
             return True
         except exception.NotAuthorized:
             return False
@@ -451,3 +452,42 @@ class V3APIExtensionBase(object):
     def version(self):
         """Version of the extension."""
         pass
+
+
+def expected_errors(errors):
+    """Decorator for v3 API methods which specifies expected exceptions.
+
+    Specify which exceptions may occur when an API method is called. If an
+    unexpected exception occurs then return a 500 instead and ask the user
+    of the API to file a bug report.
+    """
+    def decorator(f):
+        @functools.wraps(f)
+        def wrapped(*args, **kwargs):
+            try:
+                return f(*args, **kwargs)
+            except Exception as exc:
+                if isinstance(exc, webob.exc.WSGIHTTPException):
+                    if isinstance(errors, int):
+                        t_errors = (errors,)
+                    else:
+                        t_errors = errors
+                    if exc.code in t_errors:
+                        raise
+                elif isinstance(exc, exception.PolicyNotAuthorized):
+                    # Note(cyeoh): Special case to handle
+                    # PolicyNotAuthorized exceptions so every
+                    # extension method does not need to wrap authorize
+                    # calls. ResourceExceptionHandler silently
+                    # converts NotAuthorized to HTTPForbidden
+                    raise
+
+                LOG.exception(_("Unexpected exception in API method"))
+                msg = _('Unexpected API Error. Please report this at '
+                    'http://bugs.launchpad.net/nova/ and attach the Nova '
+                    'API log if possible.\n%s') % type(exc)
+                raise webob.exc.HTTPInternalServerError(explanation=msg)
+
+        return wrapped
+
+    return decorator
diff --git a/nova/cells/manager.py b/nova/cells/manager.py
index f776c542e..4dc9f2d82 100644
--- a/nova/cells/manager.py
+++ b/nova/cells/manager.py
@@ -64,7 +64,7 @@ class CellsManager(manager.Manager):
 
     Scheduling requests get passed to the scheduler class.
     """
-    RPC_API_VERSION = '1.9'
+    RPC_API_VERSION = '1.10'
 
     def __init__(self, *args, **kwargs):
         # Mostly for tests.
@@ -390,3 +390,14 @@ class CellsManager(manager.Manager):
 
     def get_capacities(self, ctxt, cell_name):
         return self.state_manager.get_capacities(cell_name)
+
+    def bdm_update_or_create_at_top(self, ctxt, bdm, create=None):
+        """BDM was created/updated in this cell.  Tell the API cells."""
+        self.msg_runner.bdm_update_or_create_at_top(ctxt, bdm, create=create)
+
+    def bdm_destroy_at_top(self, ctxt, instance_uuid, device_name=None,
+                           volume_id=None):
+        """BDM was destroyed for instance in this cell.  Tell the API cells."""
+        self.msg_runner.bdm_destroy_at_top(ctxt, instance_uuid,
+                                           device_name=device_name,
+                                           volume_id=volume_id)
diff --git a/nova/cells/messaging.py b/nova/cells/messaging.py
index 319067836..cacb4b8e3 100644
--- a/nova/cells/messaging.py
+++ b/nova/cells/messaging.py
@@ -36,6 +36,7 @@ from nova.consoleauth import rpcapi as consoleauth_rpcapi
 from nova import context
 from nova.db import base
 from nova import exception
+from nova.objects import instance as instance_obj
 from nova.openstack.common import excutils
 from nova.openstack.common import importutils
 from nova.openstack.common import jsonutils
@@ -678,6 +679,13 @@ class _TargetedMessageMethods(_BaseMessageMethods):
                 instance = {'uuid': instance_uuid}
                 self.msg_runner.instance_destroy_at_top(message.ctxt,
                                                         instance)
+        # FIXME(comstud): This is temporary/transitional until I can
+        # work out a better way to pass full objects down.
+        EXPECTS_OBJECTS = ['start', 'stop']
+        if method in EXPECTS_OBJECTS:
+            inst_obj = instance_obj.Instance()
+            inst_obj._from_db_object(inst_obj, instance)
+            instance = inst_obj
         args[0] = instance
         return fn(message.ctxt, *args, **method_info['method_kwargs'])
 
@@ -813,12 +821,10 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
             info_cache.pop('id', None)
             info_cache.pop('instance', None)
 
-        # Fixup system_metadata (should be a dict for update, not a list)
-        if ('system_metadata' in instance and
-                isinstance(instance['system_metadata'], list)):
-            sys_metadata = dict([(md['key'], md['value'])
-                    for md in instance['system_metadata']])
-            instance['system_metadata'] = sys_metadata
+        if 'system_metadata' in instance:
+            # Make sure we have the dict form that we need for
+            # instance_update.
+            instance['system_metadata'] = utils.instance_sys_meta(instance)
 
         LOG.debug(_("Got update for instance: %(instance)s"),
                   {'instance': instance}, instance_uuid=instance_uuid)
@@ -848,7 +854,8 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
             except exception.NotFound:
                 # FIXME(comstud): Strange.  Need to handle quotas here,
                 # if we actually want this code to remain..
-                self.db.instance_create(message.ctxt, instance)
+                self.db.instance_create(message.ctxt, instance,
+                                        legacy=False)
         if info_cache:
             try:
                 self.db.instance_info_cache_update(
@@ -959,6 +966,60 @@ class _BroadcastMessageMethods(_BaseMessageMethods):
         self.consoleauth_rpcapi.delete_tokens_for_instance(message.ctxt,
                                                            instance_uuid)
 
+    def bdm_update_or_create_at_top(self, message, bdm, create):
+        """Create or update a block device mapping in API cells.  If
+        create is True, only try to create.  If create is None, try to
+        update but fall back to create.  If create is False, only attempt
+        to update.  This maps to nova-conductor's behavior.
+        """
+        if not self._at_the_top():
+            return
+        items_to_remove = ['id']
+        for key in items_to_remove:
+            bdm.pop(key, None)
+        if create is None:
+            self.db.block_device_mapping_update_or_create(message.ctxt,
+                                                          bdm,
+                                                          legacy=False)
+            return
+        elif create is True:
+            self.db.block_device_mapping_create(message.ctxt, bdm,
+                                                legacy=False)
+            return
+        # Unfortunately this update call wants BDM ID... but we don't know
+        # what it is in this cell.  Search for it.. try matching either
+        # device_name or volume_id.
+        dev_name = bdm['device_name']
+        vol_id = bdm['volume_id']
+        instance_bdms = self.db.block_device_mapping_get_all_by_instance(
+                message.ctxt, bdm['instance_uuid'])
+        for instance_bdm in instance_bdms:
+            if dev_name and instance_bdm['device_name'] == dev_name:
+                break
+            if vol_id and instance_bdm['volume_id'] == vol_id:
+                break
+        else:
+            LOG.warn(_("No match when trying to update BDM: %(bdm)s"),
+                     dict(bdm=bdm))
+            return
+        self.db.block_device_mapping_update(message.ctxt,
+                                            instance_bdm['id'], bdm,
+                                            legacy=False)
+
+    def bdm_destroy_at_top(self, message, instance_uuid, device_name,
+                           volume_id):
+        """Destroy a block device mapping in API cells by device name
+        or volume_id.  device_name or volume_id can be None, but not both.
+        """
+        if not self._at_the_top():
+            return
+        if device_name:
+            self.db.block_device_mapping_destroy_by_instance_and_device(
+                    message.ctxt, instance_uuid, device_name)
+        elif volume_id:
+            self.db.block_device_mapping_destroy_by_instance_and_volume(
+                    message.ctxt, instance_uuid, volume_id)
+
 
 _CELL_MESSAGE_TYPE_TO_MESSAGE_CLS = {'targeted': _TargetedMessage,
                                      'broadcast': _BroadcastMessage,
@@ -1344,6 +1405,25 @@ class MessageRunner(object):
                                    cell_name, need_response=True)
         return message.process()
 
+    def bdm_update_or_create_at_top(self, ctxt, bdm, create=None):
+        """Update/Create a BDM at top level cell."""
+        message = _BroadcastMessage(self, ctxt,
+                                    'bdm_update_or_create_at_top',
+                                    dict(bdm=bdm, create=create),
+                                    'up', run_locally=False)
+        message.process()
+
+    def bdm_destroy_at_top(self, ctxt, instance_uuid, device_name=None,
+                           volume_id=None):
+        """Destroy a BDM at top level cell."""
+        method_kwargs = dict(instance_uuid=instance_uuid,
+                             device_name=device_name,
+                             volume_id=volume_id)
+        message = _BroadcastMessage(self, ctxt, 'bdm_destroy_at_top',
+                                    method_kwargs,
+                                    'up', run_locally=False)
+        message.process()
+
     @staticmethod
     def get_message_types():
         return _CELL_MESSAGE_TYPE_TO_MESSAGE_CLS.keys()
diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py
index e65d8f490..6a5480073 100644
--- a/nova/cells/rpcapi.py
+++ b/nova/cells/rpcapi.py
@@ -26,9 +26,11 @@ 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.openstack.common.rpc import proxy as rpc_proxy
 
 
+LOG = logging.getLogger(__name__)
 CONF = cfg.CONF
 CONF.import_opt('enable', 'nova.cells.opts', group='cells')
 CONF.import_opt('topic', 'nova.cells.opts', group='cells')
@@ -62,6 +64,7 @@ class CellsAPI(rpc_proxy.RpcProxy):
         1.7 - Adds service_update()
         1.8 - Adds build_instances(), deprecates schedule_run_instance()
         1.9 - Adds get_capacities()
+        1.10 - Adds bdm_update_or_create_at_top(), and bdm_destroy_at_top()
     '''
     BASE_RPC_API_VERSION = '1.0'
 
@@ -315,3 +318,34 @@ class CellsAPI(rpc_proxy.RpcProxy):
         return self.call(ctxt,
                          self.make_msg('get_capacities', cell_name=cell_name),
                          version='1.9')
+
+    def bdm_update_or_create_at_top(self, ctxt, bdm, create=None):
+        """Create or update a block device mapping in API cells.  If
+        create is True, only try to create.  If create is None, try to
+        update but fall back to create.  If create is False, only attempt
+        to update.  This maps to nova-conductor's behavior.
+        """
+        if not CONF.cells.enable:
+            return
+        try:
+            self.cast(ctxt, self.make_msg('bdm_update_or_create_at_top',
+                                          bdm=bdm, create=create),
+                      version='1.10')
+        except Exception:
+            LOG.exception(_("Failed to notify cells of BDM update/create."))
+
+    def bdm_destroy_at_top(self, ctxt, instance_uuid, device_name=None,
+                           volume_id=None):
+        """Broadcast upwards that a block device mapping was destroyed.
+        One of device_name or volume_id should be specified.
+        """
+        if not CONF.cells.enable:
+            return
+        try:
+            self.cast(ctxt, self.make_msg('bdm_destroy_at_top',
+                                          instance_uuid=instance_uuid,
+                                          device_name=device_name,
+                                          volume_id=volume_id),
+                      version='1.10')
+        except Exception:
+            LOG.exception(_("Failed to notify cells of BDM destroy."))
diff --git a/nova/cells/scheduler.py b/nova/cells/scheduler.py
index aa081a726..08f485189 100644
--- a/nova/cells/scheduler.py
+++ b/nova/cells/scheduler.py
@@ -175,9 +175,10 @@ class CellsScheduler(base.Base):
         """Attempt to build instance(s) or send msg to child cell."""
         ctxt = message.ctxt
         instance_properties = build_inst_kwargs['instances'][0]
-        instance_type = build_inst_kwargs['instance_type']
+        filter_properties = build_inst_kwargs['filter_properties']
+        instance_type = filter_properties['instance_type']
         image = build_inst_kwargs['image']
-        security_groups = build_inst_kwargs['security_group']
+        security_groups = build_inst_kwargs['security_groups']
         block_device_mapping = build_inst_kwargs['block_device_mapping']
 
         LOG.debug(_("Building instances with routing_path=%(routing_path)s"),
diff --git a/nova/compute/api.py b/nova/compute/api.py
index 0a9b0e67b..70e205dc2 100644
--- a/nova/compute/api.py
+++ b/nova/compute/api.py
@@ -3216,7 +3216,8 @@ class SecurityGroupAPI(base.Base, security_group_base.SecurityGroupBase):
     def trigger_rules_refresh(self, context, id):
         """Called when a rule is added to or removed from a security_group."""
 
-        security_group = self.db.security_group_get(context, id)
+        security_group = self.db.security_group_get(
+            context, id, columns_to_join=['instances'])
 
         for instance in security_group['instances']:
             if instance['host'] is not None:
@@ -3242,8 +3243,8 @@ class SecurityGroupAPI(base.Base, security_group_base.SecurityGroupBase):
         security_groups = set()
         for rule in security_group_rules:
             security_group = self.db.security_group_get(
-                                                    context,
-                                                    rule['parent_group_id'])
+                context, rule['parent_group_id'],
+                columns_to_join=['instances'])
             security_groups.add(security_group)
 
         # ..then we find the instances that are members of these groups..
diff --git a/nova/compute/cells_api.py b/nova/compute/cells_api.py
index 6f1e12480..ddf959ef3 100644
--- a/nova/compute/cells_api.py
+++ b/nova/compute/cells_api.py
@@ -520,8 +520,6 @@ class ComputeCellsAPI(compute_api.API):
         """Attach an existing volume to an existing instance."""
         if device and not block_device.match_device(device):
             raise exception.InvalidDevicePath(path=device)
-        device = self.compute_rpcapi.reserve_block_device_name(
-            context, device=device, instance=instance, volume_id=volume_id)
         try:
             volume = self.volume_api.get(context, volume_id)
             self.volume_api.check_attach(context, volume, instance=instance)
@@ -529,7 +527,7 @@ class ComputeCellsAPI(compute_api.API):
             with excutils.save_and_reraise_exception():
                 self.db.block_device_mapping_destroy_by_instance_and_device(
                         context, instance['uuid'], device)
-        self._cast_to_cells(context, instance, 'attach_volume',
+        return self._call_to_cells(context, instance, 'attach_volume',
                 volume_id, device)
 
     @validate_cell
diff --git a/nova/compute/flavors.py b/nova/compute/flavors.py
index 59d5d5715..a18b375d8 100644
--- a/nova/compute/flavors.py
+++ b/nova/compute/flavors.py
@@ -95,20 +95,20 @@ def create(name, memory, vcpus, root_gb, ephemeral_gb=0, flavorid=None,
     # Some attributes are positive ( > 0) integers
     for option in ['memory_mb', 'vcpus']:
         try:
+            assert int(str(kwargs[option])) > 0
             kwargs[option] = int(kwargs[option])
-            assert kwargs[option] > 0
-        except (ValueError, AssertionError):
-            msg = _("'%s' argument must be greater than 0") % option
+        except (ValueError, AssertionError, TypeError):
+            msg = _("'%s' argument must be a positive integer") % option
             raise exception.InvalidInput(reason=msg)
 
     # Some attributes are non-negative ( >= 0) integers
     for option in ['root_gb', 'ephemeral_gb', 'swap']:
         try:
+            assert int(str(kwargs[option])) >= 0
             kwargs[option] = int(kwargs[option])
-            assert kwargs[option] >= 0
-        except (ValueError, AssertionError):
-            msg = _("'%s' argument must be greater than or equal"
-                    " to 0") % option
+        except (ValueError, AssertionError, TypeError):
+            msg = _("'%s' argument must be an integer greater than or"
+                    " equal to 0") % option
             raise exception.InvalidInput(reason=msg)
 
     # rxtx_factor should be a positive float
diff --git a/nova/compute/manager.py b/nova/compute/manager.py
index 237831cd1..a242a121d 100755
--- a/nova/compute/manager.py
+++ b/nova/compute/manager.py
@@ -282,7 +282,8 @@ def object_compat(function):
         instance = kwargs['instance']
         if isinstance(instance, dict):
             kwargs['instance'] = instance_obj.Instance._from_db_object(
-                instance_obj.Instance(), instance, expected_attrs=metas)
+                context, instance_obj.Instance(), instance,
+                expected_attrs=metas)
             kwargs['instance']._context = context
         return function(self, context, **kwargs)
 
@@ -1345,7 +1346,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         # get network info before tearing down
         try:
             network_info = self._get_instance_nw_info(context, instance)
-        except exception.NetworkNotFound:
+        except (exception.NetworkNotFound, exception.NoMoreFixedIps):
             network_info = network_model.NetworkInfo()
 
         # NOTE(vish) get bdms before destroying the instance
@@ -1447,7 +1448,7 @@ class ComputeManager(manager.SchedulerDependentManager):
                                              vm_state=vm_states.DELETED,
                                              task_state=None,
                                              terminated_at=timeutils.utcnow())
-            system_meta = utils.metadata_to_dict(instance['system_metadata'])
+            system_meta = utils.instance_sys_meta(instance)
             self.conductor_api.instance_destroy(context, instance)
         except Exception:
             with excutils.save_and_reraise_exception():
@@ -1539,7 +1540,14 @@ class ComputeManager(manager.SchedulerDependentManager):
     def start_instance(self, context, instance):
         """Starting an instance on this host."""
         self._notify_about_instance_usage(context, instance, "power_on.start")
-        self.driver.power_on(instance)
+
+        network_info = self._get_instance_nw_info(context, instance)
+        block_device_info = self._get_instance_volume_block_device_info(
+                                context, instance)
+        self.driver.power_on(context, instance,
+                             self._legacy_nw_info(network_info),
+                             block_device_info)
+
         current_power_state = self._get_power_state(context, instance)
         instance.power_state = current_power_state
         instance.vm_state = vm_states.ACTIVE
@@ -1594,7 +1602,12 @@ class ComputeManager(manager.SchedulerDependentManager):
         except NotImplementedError:
             # Fallback to just powering on the instance if the hypervisor
             # doesn't implement the restore method
-            self.driver.power_on(instance)
+            network_info = self._get_instance_nw_info(context, instance)
+            block_device_info = self._get_instance_volume_block_device_info(
+                                context, instance)
+            self.driver.power_on(context, instance,
+                                 self._legacy_nw_info(network_info),
+                                 block_device_info)
         current_power_state = self._get_power_state(context, instance)
         instance = self._instance_update(context, instance['uuid'],
                 power_state=current_power_state,
@@ -2072,7 +2085,7 @@ class ComputeManager(manager.SchedulerDependentManager):
 
     def _get_rescue_image_ref(self, context, instance):
         """Determine what image should be used to boot the rescue VM."""
-        system_meta = utils.metadata_to_dict(instance['system_metadata'])
+        system_meta = utils.instance_sys_meta(instance)
 
         rescue_image_ref = system_meta.get('image_base_image_ref')
 
@@ -2174,7 +2187,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         Returns the updated system_metadata as a dict, as well as the
         post-cleanup current instance type.
         """
-        sys_meta = utils.metadata_to_dict(instance['system_metadata'])
+        sys_meta = utils.instance_sys_meta(instance)
         if restore_old:
             instance_type = flavors.extract_flavor(instance, 'old_')
             sys_meta = flavors.save_flavor_info(sys_meta, instance_type)
@@ -2428,9 +2441,8 @@ class ComputeManager(manager.SchedulerDependentManager):
 
         # NOTE(danms): Stash the new instance_type to avoid having to
         # look it up in the database later
-        sys_meta = utils.metadata_to_dict(instance['system_metadata'])
-        flavors.save_flavor_info(sys_meta, instance_type,
-                                                prefix='new_')
+        sys_meta = utils.instance_sys_meta(instance)
+        flavors.save_flavor_info(sys_meta, instance_type, prefix='new_')
         # NOTE(mriedem): Stash the old vm_state so we can set the
         # resized/reverted instance back to the same state later.
         vm_state = instance['vm_state']
@@ -2600,7 +2612,7 @@ class ComputeManager(manager.SchedulerDependentManager):
         old_instance_type_id = migration['old_instance_type_id']
         new_instance_type_id = migration['new_instance_type_id']
         old_instance_type = flavors.extract_flavor(instance)
-        sys_meta = utils.metadata_to_dict(instance['system_metadata'])
+        sys_meta = utils.instance_sys_meta(instance)
         # NOTE(mriedem): Get the old_vm_state so we know if we should
         # power on the instance. If old_vm_sate is not set we need to default
         # to ACTIVE for backwards compatibility
diff --git a/nova/compute/utils.py b/nova/compute/utils.py
index 9637d8773..3db4a14f2 100644
--- a/nova/compute/utils.py
+++ b/nova/compute/utils.py
@@ -203,8 +203,7 @@ def notify_usage_exists(context, instance_ref, current_period=False,
             ignore_missing_network_data)
 
     if system_metadata is None:
-        system_metadata = utils.metadata_to_dict(
-                instance_ref['system_metadata'])
+        system_metadata = utils.instance_sys_meta(instance_ref)
 
     # add image metadata to the notification:
     image_meta = notifications.image_meta(system_metadata)
diff --git a/nova/conductor/manager.py b/nova/conductor/manager.py
index cc1b05cc4..40e7fa69b 100644
--- a/nova/conductor/manager.py
+++ b/nova/conductor/manager.py
@@ -18,6 +18,7 @@ import copy
 
 from nova.api.ec2 import ec2utils
 from nova import block_device
+from nova.cells import rpcapi as cells_rpcapi
 from nova.compute import api as compute_api
 from nova.compute import utils as compute_utils
 from nova import exception
@@ -77,6 +78,7 @@ class ConductorManager(manager.Manager):
         self._compute_api = None
         self.compute_task_mgr = ComputeTaskManager()
         self.quotas = quota.QUOTAS
+        self.cells_rpcapi = cells_rpcapi.CellsAPI()
 
     def create_rpc_dispatcher(self, *args, **kwargs):
         kwargs['additional_apis'] = [self.compute_task_mgr]
@@ -258,11 +260,18 @@ class ConductorManager(manager.Manager):
     def block_device_mapping_update_or_create(self, context, values,
                                               create=None):
         if create is None:
-            self.db.block_device_mapping_update_or_create(context, values)
+            bdm = self.db.block_device_mapping_update_or_create(context,
+                                                                values)
         elif create is True:
-            self.db.block_device_mapping_create(context, values)
+            bdm = self.db.block_device_mapping_create(context, values)
         else:
-            self.db.block_device_mapping_update(context, values['id'], values)
+            bdm = self.db.block_device_mapping_update(context,
+                                                      values['id'],
+                                                      values)
+        # NOTE:comstud): 'bdm' is always in the new format, so we
+        # account for this in cells/messaging.py
+        self.cells_rpcapi.bdm_update_or_create_at_top(context, bdm,
+                                                      create=create)
 
     def block_device_mapping_get_all_by_instance(self, context, instance,
                                                  legacy=True):
@@ -278,12 +287,36 @@ class ConductorManager(manager.Manager):
         if bdms is not None:
             for bdm in bdms:
                 self.db.block_device_mapping_destroy(context, bdm['id'])
+                # NOTE(comstud): bdm['id'] will be different in API cell,
+                # so we must try to destroy by device_name or volume_id.
+                # We need an instance_uuid in order to do this properly,
+                # too.
+                # I hope to clean a lot of this up in the object
+                # implementation.
+                instance_uuid = (bdm['instance_uuid'] or
+                                    (instance and instance['uuid']))
+                if not instance_uuid:
+                    continue
+                # Better to be safe than sorry.  device_name is not
+                # NULLable, however it could be an empty string.
+                if bdm['device_name']:
+                    self.cells_rpcapi.bdm_destroy_at_top(
+                            context, instance_uuid,
+                            device_name=bdm['device_name'])
+                elif bdm['volume_id']:
+                    self.cells_rpcapi.bdm_destroy_at_top(
+                            context, instance_uuid,
+                            volume_id=bdm['volume_id'])
         elif instance is not None and volume_id is not None:
             self.db.block_device_mapping_destroy_by_instance_and_volume(
                 context, instance['uuid'], volume_id)
+            self.cells_rpcapi.bdm_destroy_at_top(
+                context, instance['uuid'], volume_id=volume_id)
         elif instance is not None and device_name is not None:
             self.db.block_device_mapping_destroy_by_instance_and_device(
                 context, instance['uuid'], device_name)
+            self.cells_rpcapi.bdm_destroy_at_top(
+                context, instance['uuid'], device_name=device_name)
         else:
             # NOTE(danms): This shouldn't happen
             raise exception.Invalid(_("Invalid block_device_mapping_destroy"
diff --git a/nova/conductor/tasks/__init__.py b/nova/conductor/tasks/__init__.py
new file mode 100644
index 000000000..94e731d20
--- /dev/null
+++ b/nova/conductor/tasks/__init__.py
@@ -0,0 +1,11 @@
+#    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.
diff --git a/nova/conductor/tasks/live_migrate.py b/nova/conductor/tasks/live_migrate.py
new file mode 100644
index 000000000..3c7f2ac16
--- /dev/null
+++ b/nova/conductor/tasks/live_migrate.py
@@ -0,0 +1,173 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    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.
+
+from oslo.config import cfg
+
+from nova.compute import flavors
+from nova.compute import power_state
+from nova.compute import rpcapi as compute_rpcapi
+from nova import db
+from nova import exception
+from nova.image import glance
+from nova.openstack.common import log as logging
+from nova import servicegroup
+
+LOG = logging.getLogger(__name__)
+
+CONF = cfg.CONF
+CONF.import_opt('scheduler_max_attempts', 'nova.scheduler.driver')
+
+
+class LiveMigrationTask(object):
+    def __init__(self, context, instance, destination,
+                 block_migration, disk_over_commit,
+                 select_hosts_callback):
+        self.context = context
+        self.instance = instance
+        self.destination = destination
+        self.block_migration = block_migration
+        self.disk_over_commit = disk_over_commit
+        self.select_hosts_callback = select_hosts_callback
+        self.source = instance['host']
+        self.migrate_data = None
+        self.compute_rpcapi = compute_rpcapi.ComputeAPI()
+        self.servicegroup_api = servicegroup.API()
+        self.image_service = glance.get_default_image_service()
+
+    def execute(self):
+        self._check_instance_is_running()
+        self._check_host_is_up(self.source)
+
+        if not self.destination:
+            self.destination = self._find_destination()
+        else:
+            self._check_requested_destination()
+
+        #TODO(johngarbutt) need to move complexity out of compute manager
+        return self.compute_rpcapi.live_migration(self.context,
+                host=self.source,
+                instance=self.instance,
+                dest=self.destination,
+                block_migration=self.block_migration,
+                migrate_data=self.migrate_data)
+                #TODO(johngarbutt) disk_over_commit?
+
+    def rollback(self):
+        #TODO(johngarbutt) need to implement the clean up operation
+        raise NotImplementedError()
+
+    def _check_instance_is_running(self):
+        if self.instance['power_state'] != power_state.RUNNING:
+            raise exception.InstanceNotRunning(
+                    instance_id=self.instance['uuid'])
+
+    def _check_host_is_up(self, host):
+        try:
+            service = db.service_get_by_compute_host(self.context, host)
+        except exception.NotFound:
+            raise exception.ComputeServiceUnavailable(host=host)
+
+        if not self.servicegroup_api.service_is_up(service):
+            raise exception.ComputeServiceUnavailable(host=host)
+
+    def _check_requested_destination(self):
+        self._check_destination_is_not_source()
+        self._check_host_is_up(self.destination)
+        self._check_destination_has_enough_memory()
+        self._check_compatible_with_source_hypervisor(self.destination)
+        self._call_livem_checks_on_host(self.destination)
+
+    def _check_destination_is_not_source(self):
+        if self.destination == self.source:
+            raise exception.UnableToMigrateToSelf(
+                    instance_id=self.instance['uuid'], host=self.destination)
+
+    def _check_destination_has_enough_memory(self):
+        avail = self._get_compute_info(self.destination)['free_ram_mb']
+        mem_inst = self.instance['memory_mb']
+
+        if not mem_inst or avail <= mem_inst:
+            instance_uuid = self.instance['uuid']
+            dest = self.destination
+            reason = _("Unable to migrate %(instance_uuid)s to %(dest)s: "
+                       "Lack of memory(host:%(avail)s <= "
+                       "instance:%(mem_inst)s)")
+            raise exception.MigrationPreCheckError(reason=reason % dict(
+                    instance_uuid=instance_uuid, dest=dest, avail=avail,
+                    mem_inst=mem_inst))
+
+    def _get_compute_info(self, host):
+        service_ref = db.service_get_by_compute_host(self.context, host)
+        return service_ref['compute_node'][0]
+
+    def _check_compatible_with_source_hypervisor(self, destination):
+        source_info = self._get_compute_info(self.source)
+        destination_info = self._get_compute_info(destination)
+
+        source_type = source_info['hypervisor_type']
+        destination_type = destination_info['hypervisor_type']
+        if source_type != destination_type:
+            raise exception.InvalidHypervisorType()
+
+        source_version = source_info['hypervisor_version']
+        destination_version = destination_info['hypervisor_version']
+        if source_version > destination_version:
+            raise exception.DestinationHypervisorTooOld()
+
+    def _call_livem_checks_on_host(self, destination):
+        self.migrate_data = self.compute_rpcapi.\
+            check_can_live_migrate_destination(self.context, self.instance,
+                destination, self.block_migration, self.disk_over_commit)
+
+    def _find_destination(self):
+        #TODO(johngarbutt) this retry loop should be shared
+        ignore_hosts = [self.source]
+        image = self.image_service.show(self.context,
+                                        self.instance['image_ref'])
+        instance_type = flavors.extract_flavor(self.instance)
+
+        host = None
+        while host is None:
+            self._check_not_over_max_attempts(ignore_hosts)
+
+            host = self._get_candidate_destination(image,
+                    instance_type, ignore_hosts)
+            try:
+                self._check_compatible_with_source_hypervisor(host)
+                self._call_livem_checks_on_host(host)
+            except exception.Invalid as e:
+                LOG.debug(_("Skipping host: %(host)s because: %(e)s") %
+                    {"host": host, "e": e})
+                ignore_hosts.append(host)
+                host = None
+        return host
+
+    def _get_candidate_destination(self, image, instance_type, ignore_hosts):
+        request_spec = {'instance_properties': self.instance,
+                        'instance_type': instance_type,
+                        'instance_uuids': [self.instance['uuid']],
+                        'image': image}
+        filter_properties = {'ignore_hosts': ignore_hosts}
+        #TODO(johngarbutt) this should be an rpc call to scheduler
+        return self.select_hosts_callback(self.context, request_spec,
+                                          filter_properties)[0]
+
+    def _check_not_over_max_attempts(self, ignore_hosts):
+        attempts = len(ignore_hosts)
+        if attempts > CONF.scheduler_max_attempts:
+            msg = (_('Exceeded max scheduling attempts %(max_attempts)d for '
+                     'instance %(instance_uuid)s during live migration')
+                   % {'max_attempts': attempts,
+                      'instance_uuid': self.instance['uuid']})
+            raise exception.NoValidHost(reason=msg)
diff --git a/nova/db/api.py b/nova/db/api.py
index 973be1a26..bd519110c 100644
--- a/nova/db/api.py
+++ b/nova/db/api.py
@@ -1151,9 +1151,10 @@ def security_group_get_all(context):
     return IMPL.security_group_get_all(context)
 
 
-def security_group_get(context, security_group_id):
+def security_group_get(context, security_group_id, columns_to_join=None):
     """Get security group by its id."""
-    return IMPL.security_group_get(context, security_group_id)
+    return IMPL.security_group_get(context, security_group_id,
+                                   columns_to_join)
 
 
 def security_group_get_by_name(context, project_id, group_name):
diff --git a/nova/db/sqlalchemy/api.py b/nova/db/sqlalchemy/api.py
index fd79ae215..9e0f8f7e0 100644
--- a/nova/db/sqlalchemy/api.py
+++ b/nova/db/sqlalchemy/api.py
@@ -2788,6 +2788,7 @@ def _get_quota_usages(context, session, project_id):
 
 
 @require_context
+@_retry_on_deadlock
 def quota_reserve(context, resources, quotas, deltas, expire,
                   until_refresh, max_age, project_id=None):
     elevated = context.elevated()
@@ -3123,15 +3124,16 @@ def block_device_mapping_create(context, values, legacy=True):
     bdm_ref = models.BlockDeviceMapping()
     bdm_ref.update(values)
     bdm_ref.save()
+    return bdm_ref
 
 
 @require_context
 def block_device_mapping_update(context, bdm_id, values, legacy=True):
     _scrub_empty_str_values(values, ['volume_size'])
     values = _from_legacy_values(values, legacy, allow_updates=True)
-    _block_device_mapping_get_query(context).\
-            filter_by(id=bdm_id).\
-            update(values)
+    query = _block_device_mapping_get_query(context).filter_by(id=bdm_id)
+    query.update(values)
+    return query.first()
 
 
 def block_device_mapping_update_or_create(context, values, legacy=True):
@@ -3147,6 +3149,7 @@ def block_device_mapping_update_or_create(context, values, legacy=True):
             bdm_ref = models.BlockDeviceMapping()
             bdm_ref.update(values)
             bdm_ref.save(session=session)
+            result = bdm_ref
         else:
             values = _from_legacy_values(values, legacy, allow_updates=True)
             result.update(values)
@@ -3169,6 +3172,7 @@ def block_device_mapping_update_or_create(context, values, legacy=True):
                     models.BlockDeviceMapping.guest_format == None,
                     models.BlockDeviceMapping.guest_format != 'swap')).
                  soft_delete())
+        return result
 
 
 @require_context
@@ -3241,13 +3245,17 @@ def security_group_get_all(context):
 
 
 @require_context
-def security_group_get(context, security_group_id, session=None):
-    result = _security_group_get_query(context, session=session,
-                                       project_only=True).\
-                    filter_by(id=security_group_id).\
-                    options(joinedload_all('instances')).\
-                    first()
+def security_group_get(context, security_group_id, columns_to_join=None,
+                       session=None):
+    query = _security_group_get_query(context, session=session,
+                                      project_only=True).\
+                filter_by(id=security_group_id)
+    if columns_to_join is None:
+        columns_to_join = []
+    if 'instances' in columns_to_join:
+        query = query.options(joinedload_all('instances'))
 
+    result = query.first()
     if not result:
         raise exception.SecurityGroupNotFound(
                 security_group_id=security_group_id)
diff --git a/nova/db/sqlalchemy/models.py b/nova/db/sqlalchemy/models.py
index 9b6d849d3..183a42f60 100644
--- a/nova/db/sqlalchemy/models.py
+++ b/nova/db/sqlalchemy/models.py
@@ -367,11 +367,12 @@ class Quota(BASE, NovaBase):
     """
 
     __tablename__ = 'quotas'
+    __table_args__ = ()
     id = Column(Integer, primary_key=True)
 
-    project_id = Column(String(255), index=True)
+    project_id = Column(String(255), nullable=True)
 
-    resource = Column(String(255))
+    resource = Column(String(255), nullable=False)
     hard_limit = Column(Integer, nullable=True)
 
 
@@ -384,11 +385,14 @@ class QuotaClass(BASE, NovaBase):
     """
 
     __tablename__ = 'quota_classes'
+    __table_args__ = (
+        Index('ix_quota_classes_class_name', 'class_name'),
+    )
     id = Column(Integer, primary_key=True)
 
-    class_name = Column(String(255), index=True)
+    class_name = Column(String(255), nullable=True)
 
-    resource = Column(String(255))
+    resource = Column(String(255), nullable=True)
     hard_limit = Column(Integer, nullable=True)
 
 
@@ -396,13 +400,16 @@ class QuotaUsage(BASE, NovaBase):
     """Represents the current usage for a given resource."""
 
     __tablename__ = 'quota_usages'
+    __table_args__ = (
+        Index('ix_quota_usages_project_id', 'project_id'),
+    )
     id = Column(Integer, primary_key=True)
 
-    project_id = Column(String(255), index=True)
-    resource = Column(String(255))
+    project_id = Column(String(255), nullable=True)
+    resource = Column(String(255), nullable=True)
 
-    in_use = Column(Integer)
-    reserved = Column(Integer)
+    in_use = Column(Integer, nullable=False)
+    reserved = Column(Integer, nullable=False)
 
     @property
     def total(self):
diff --git a/nova/exception.py b/nova/exception.py
index 2b3903e1e..e5924b831 100644
--- a/nova/exception.py
+++ b/nova/exception.py
@@ -25,6 +25,7 @@ SHOULD include dedicated exception logging.
 """
 
 import functools
+import sys
 
 from oslo.config import cfg
 import webob.exc
@@ -127,7 +128,8 @@ class NovaException(Exception):
             try:
                 message = self.message % kwargs
 
-            except Exception as e:
+            except Exception:
+                exc_info = sys.exc_info()
                 # kwargs doesn't match a variable in the message
                 # log the issue and the kwargs
                 LOG.exception(_('Exception in string format operation'))
@@ -135,7 +137,7 @@ class NovaException(Exception):
                     LOG.error("%s: %s" % (name, value))
 
                 if CONF.fatal_exception_format_errors:
-                    raise e
+                    raise exc_info[0], exc_info[1], exc_info[2]
                 else:
                     # at least get the core message out if something happened
                     message = self.message
diff --git a/nova/locale/bg_BG/LC_MESSAGES/nova.po b/nova/locale/bg_BG/LC_MESSAGES/nova.po
index 9d1784a0c..90088a405 100644
--- a/nova/locale/bg_BG/LC_MESSAGES/nova.po
+++ b/nova/locale/bg_BG/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-18 19:07+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/bs/LC_MESSAGES/nova.po b/nova/locale/bs/LC_MESSAGES/nova.po
index bb547fb88..c11acc613 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1383,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1413,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1709,261 +1724,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2133,89 +2148,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2263,6 +2296,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2309,7 +2343,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2651,9 +2685,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2715,6 +2749,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2875,7 +2910,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2915,32 +2951,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2951,26 +2987,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3018,7 +3057,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3257,30 +3296,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3292,7 +3337,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3309,16 +3354,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3401,12 +3446,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3489,38 +3539,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3535,28 +3585,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3615,17 +3665,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3983,244 +4033,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4284,12 +4334,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4314,653 +4364,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5080,15 +5130,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5167,7 +5236,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5226,7 +5295,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5841,75 +5910,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,7 +6004,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6202,11 +6271,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6631,86 +6695,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6745,23 +6802,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6771,9 +6828,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6797,7 +6854,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7074,42 +7131,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7236,12 +7295,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7251,25 +7310,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7278,7 +7337,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7332,37 +7391,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7410,85 +7469,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7585,12 +7644,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7600,7 +7659,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7614,22 +7673,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7742,12 +7797,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8000,12 +8055,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8034,23 +8089,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8063,7 +8118,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8415,12 +8470,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8578,7 +8633,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8617,236 +8672,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8854,76 +8909,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8931,50 +8986,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8984,69 +9039,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9065,15 +9120,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9264,47 +9319,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9312,7 +9367,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9320,7 +9375,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9328,7 +9383,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9539,7 +9594,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9685,32 +9740,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9725,34 +9780,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9964,11 +10019,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10073,100 +10128,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10287,106 +10342,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10402,54 +10438,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11336,9 +11372,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/ca/LC_MESSAGES/nova.po b/nova/locale/ca/LC_MESSAGES/nova.po
index 9e9bacdd8..24239e63a 100644
--- a/nova/locale/ca/LC_MESSAGES/nova.po
+++ b/nova/locale/ca/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/cs/LC_MESSAGES/nova.po b/nova/locale/cs/LC_MESSAGES/nova.po
index 13c60c019..cdb8d1836 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -84,162 +84,162 @@ msgstr "Nelze restartovat instanci"
 msgid "Flags path: %s"
 msgstr "Cesta příznaků: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Vyskytla se neo�ekávaná výjimka."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Nelze dešifrovat text"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Nelze dešifrovat text"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Vytvoření virtuálního rozhraní selhalo"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "Selhalo 5 pokusů o vytvoření virtuálního rozhraní s jedine�nou mac adresou"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Neschváleno."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Pravidla nedovolují, aby bylo %(action)s provedeno."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Kernel nenalezen v obrazu %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Nepřijatelné parametry."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 #, fuzzy
 msgid "Block Device Mapping is Invalid."
 msgstr "block_device_mapping %s"
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Svazek %(volume_id)s není k ni�emu připojen"
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Data páru klí�ů jsou neplatná"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "Požadavek je neplatný."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Obdržen neplatný vstup"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Neplatný svazek"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "Neplatná metadata"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Neplatný klí� metadata"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Neplatný rozsah portů %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Neplatný protokol IP %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Neplatný typ obsahu %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Neplatný cidr %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -248,16 +248,16 @@ msgstr ""
 "Nelze provést �innost '%(action)s' na agregátu %(aggregate_id)s. Důvod: "
 "%(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -266,119 +266,119 @@ msgstr ""
 "Instance %(instance_uuid)s v %(attr)s %(state)s.  Nelze %(method)s "
 "zatímco je instance v tomto stavu."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s není spuštěna."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s není pozastavena."
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Nelze vložit soubor: %(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Nelze restartovat instanci"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Služba je v tuto chvíli nedostupná."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Služba výpo�tu je v tuto chvíli nedostupná."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Nelze přesunout instanci (%(instance_id)s) na sou�asného hostitele "
 "(%(host)s)."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Zadaný typ hypervizoru je neplatný."
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Instance vyžaduje novější verzi hypervizoru, než byla poskytnuta."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "Zadaná cesta disku (%(path)s) již existuje, o�ekává se, že nebude."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Zadaná cesta zařízení (%(path)s) je neplatná."
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Nepřijatelné informace o procesoru"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s není platná IP adresa v4/6."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -387,7 +387,7 @@ msgstr ""
 "Zna�ka VLAN není vhodná pro skupinu portů %(bridge)s. O�ekávaná zna�ka "
 "VLAN je %(tag)s, ale zna�ka připojená ke skupině portů je %(pgroup)s."
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -398,86 +398,86 @@ msgstr ""
 " fyzickým adaptérem. O�ekávaný vSwitch je %(expected)s, ale spojený je "
 "%(actual)s."
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formát disku %(disk_format)s není přijatelný"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Obraz %(image_id)s je nepřijatelný: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Instance %(instance_id)s je nepřijatelná: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Id Ec2 %(ec2_id)s je nepřijatelné."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Neplatný cidr %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance - %s není přítomno"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Zdroj nemohl být nalezen."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "Žádná pevná IP není spojena s %(id)s."
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "Nenalezeno žádné cílové id ve svazku %(volume_id)s."
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Źádný disk ve %(location)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Nelze najít obslužnou rutinu pro svazek %(driver_type)s."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Neplatný href %(image_href)s obrazu."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -485,65 +485,65 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "Nelze najít SR pro �tení/zápis VDI."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s je vyžadováno pro vytvoření sítě."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Síť nemohla být pro most %(bridge)s nalezena."
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Síť nemohla být pro uuid %(uuid)s nalezena."
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Síť nemohla být pro cidr %(cidr)s nalezena."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Síť nemohla být pro instance %(instance_id)s nalezena."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Źádné sítě nejsou ur�eny."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -552,233 +552,233 @@ msgstr ""
 "Bu� síť uuid %(network_uuid)s není přítomna nebo je přidělena projektu "
 "%(project_id)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "Nelze najít odkazy datového úložiště, který VM používá."
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Síť %(network_id)s nemohla být nalezena."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Síť nemohla být pro instance %(instance_id)s nalezena."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "Síť nemohla být pro instance %(instance_id)s nalezena."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "Žádná pevná IP není spojena s %(id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Pevná ip není pro adresu %(address)s nalezena."
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Instance %(instance_id)s má nula pevných ip."
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "Síťový hostitel %(host)s má nula pevných ip v síti %(network_id)s."
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Instance %(instance_id)s nemá pevnou ip '%(ip)s'."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "Pevná IP adresa (%(address)s) v síti (%(network_uuid)s) neexistuje."
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "Pevná IP adresa (%(address)s) je již používána."
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Pevná IP adresa (%(address)s) je neplatná."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "Je dostupno nula pevných ip."
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "Bylo nalezeno nula pevných ip."
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Plovoucí ip není nalezena pro id %(id)s."
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "Záznam DNS %(name)s již v doméně %(domain)s existuje."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Plovoucí ip nenalezeno pro adresu %(address)s."
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Plovoucí ip nenalezeno pro hostitele %(host)s."
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "Plovoucí ip nenalezeno pro adresu %(address)s."
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "Existuje nula plovoucích ip."
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Rozhraní %(interface)s nenalezeno."
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "Dvojice klí�ů %(name)s nenalezena pro uživatele %(user_id)s"
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Služba %(service_id)s nemohla být nalezena."
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Hostitel %(host)s nemohl být nalezen."
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Hostitel výpo�tu %(host)s nemohl být nalezen."
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Nelze najít binární soubor %(binary)s v hostiteli %(host)s."
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Kvóta nemohla být nalezena."
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Uživatel %(user_id)s nemohl být nalezen."
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Rozšířený zdroj: %s"
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Bezpe�nostní skupina %(security_group_id)s není nalezena."
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Bezpe�nostní skupina %(security_group_id)s není nalezena v projektu "
 "%(project_id)s."
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Bezpe�nostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -787,7 +787,7 @@ msgstr ""
 "Bezpe�nostní skupina %(security_group_id)s je již přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -796,37 +796,37 @@ msgstr ""
 "Bezpe�nostní skupina %(security_group_id)s není přidružena k instanci "
 "%(instance_id)s"
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "Bezpe�nostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Přesun %(migration_id)s nemohl být nalezen."
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Přesun nenalezen v instanci %(instance_id)s se stavem %(status)s."
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Zásoba konzole %(pool_id)s nemohla být nalezena."
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -835,17 +835,17 @@ msgstr ""
 "Zásoba konzole typu %(console_type)s pro výpo�etního hostitele "
 "%(compute_host)s v hostitele proxy %(host)s nemohla být nalezena."
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Konzole %(console_id)s nemohla být nalezena."
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Konzole pro instanci %(instance_id)s nemohla být nalezena."
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
@@ -854,93 +854,93 @@ msgstr ""
 "Konzole pro instanci %(instance_id)s v zásobě %(pool_id)s nemohla být "
 "nalezena."
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Neplatná konzole typu %(console_type)s "
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Instance typu %(instance_type_id)s nemohla být nalezena."
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Instance typu s názvem %(instance_type_name)s nemohla být nalezena."
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Konfigurace %(flavor_id)s nemohla být nalezena."
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "skupina svazku %s neexistuje"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 #, fuzzy
 msgid "Timeout waiting for response from cell"
 msgstr "Při �ekání na odpově� RPC vypršel �as: %s"
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Filtr hostitelů plánova�e %(filter_name)s nemohl být nalezen."
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Instance %(instance_id)s nemá žádná metadata s klí�em %(metadata_key)s."
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "Instance %(instance_id)s nemá žádná metadata s klí�em %(metadata_key)s."
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -949,455 +949,470 @@ msgstr ""
 "Instance typu %(instance_type_id)s nemá žádné dodate�né specifikace s "
 "klí�em %(extra_specs_key)s."
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Soubor %(file_path)s nemohl být nalezen."
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr "Nalezeno nula souborů."
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "Nenalezen virtuální přepína� sdružený se síťovým adaptérem %(adapter)s."
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Síťový adaptér %(adapter)s nemohl být nalezen."
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Třída %(class_name)s nemohla být nalezena: %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "Činnost není povolena."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr "Střídání není povoleno pro snímky"
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr "Parametr rotation je vyžadován pro backup image_type"
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "Dvojice klí�ů %(key_name)s již existuje."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s již existuje."
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "Chyba přesunu"
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "Chyba přesunu"
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Poškozené tělo zprávy: %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Nelze najít nastavení v %(path)s"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Nelze na�íst aplikaci vložení '%(name)s' z %(path)s"
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "Při změně velikosti ji musí instance změnit také!"
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr "Typ paměti instance je pro požadovaný obraz příliš malý."
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr "Typ disku instance je pro požadovaný obraz příliš malý."
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Pro spuštění %(uuid)s je v uzlu výpo�tu nedostatek volné paměti."
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Nelze získat metriky šířky pásma/procesoru/disku pro tohoto hostitele."
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Nebyl nalezen žádný platný hostitel. %(reason)s"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Kvóta překro�ena"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "Překro�ena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Vybrán maximální po�et hostitelů (%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Vybrán maximální po�et hostitelů (%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Vybrán maximální po�et hostitelů (%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr "Překro�en limit osobnostního souboru"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr "Cesta osobnostního souboru je příliš dlouhá"
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr "Obsah osobnostního souboru je příliš dlouhý"
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Vybrán maximální po�et hostitelů (%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Vybrán maximální po�et hostitelů (%d)"
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr "Agregát %(aggregate_id)s nemá hostitele %(host)s."
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Agregát %(aggregate_id)s nemohl být nalezen."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Agregát %(aggregate_name)s již existuje."
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "Agregát %(aggregate_id)s nemá hostitele %(host)s."
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "Agregát %(aggregate_id)s nemá žádná metadata s klí�em %(metadata_key)s."
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "Agregát %(aggregate_id)s již má hostitele %(host)s."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr "Nelze vytvořit typ instance"
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Nelze nastavit heslo správce. Instance %s není spuštěna"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Zjišťěna existující vlan s id %(vlan)"
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s nemohla být nastavena."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Konzole pro instanci %(instance_id)s nemohla být nalezena."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Svazek %(volume_id)s nemohl být nastaven."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Snímek %(snapshot_id)s nemohl být nalezen."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Obraz %(image_id)s nemohl být nalezen."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Získávání obrazu %(image)s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Plovoucí ip nenalezeno pro hostitele %(host)s."
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s nenalezena"
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "Dvojice klí�ů %(name)s nenalezena pro uživatele %(user_id)s"
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Kvóta pro projekt %(project_id)s nemohla být nalezena."
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projekt %(project_id)s nemohl být nalezen."
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password není tímto ovlada�em zavedeno"
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s není v nouzovém režimu."
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Instance typu %(name)s již existuje."
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "O�ekáván objekt typu: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1412,15 +1427,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Oznamování schopností plánova�ům ..."
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Nelze získat metadata pro ip: %s"
@@ -1443,17 +1458,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1759,274 +1774,274 @@ msgstr ""
 "Nepodporovaný požadavek API: ovlada� = %(controller)s, �innost = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Vytvořit snímek svazku %s"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Nelze dešifrovat soukromý klí�: %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Vytvořit dvojici klí�ů %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "Imprtovat klí� %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Smazat dvojici klí�ů %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Není dostatek parametrů k sestavení platného pravidla."
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Neplatný protokol IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Pro zadané parametry není žádné pravidlo."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Toto pravidlo již existuje ve skupině %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Vytvořit svazek o %s GB"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Připojit svazek %(volume_id)s k instanci %(instance_id)s na %(device)s"
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 #, fuzzy
 msgid "Attach Failed."
 msgstr "Vytvoření selhalo"
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Odpojit svazek %s"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "vlastnost není podporována: %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "svz = %s\n"
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Přidělit adresu"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "Žádné další plovoucí ip nejsou dostupné."
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Uvolnit adresu %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Přidělit adresu %(public_ip)s k instanci %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, fuzzy, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr "existuje mnoho pevných ip, použita je první: %s"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "Plovoucí ip %(address)s je přidružena."
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "Je dostupných nula plovoucích ip."
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Nelze najít adresu %r"
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Oddělit adresu %s"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "Plovoucí ip %(address)s není přidružena."
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Obraz musí být dostupný"
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "BUde spuštěno ukon�ování insatncí"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Restratovat instanci %r"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "Instance budou zastaveny"
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "Instance budou spuštěny"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Zrušení registrace obrazu %s"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Obraz %(image_location)s registrován s id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "uživatel nebo skupina nebyly zadány"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "podporována je pouze skupina \"all\""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type musí být add nebo remove"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Aktualizace publicity obrazu %s"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Nelze zastavit instanci za %d sek"
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Získávání seznamu instancí"
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance - %s není přítomno"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Získávání seznamu instancí"
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Neplatná data jednotky"
@@ -2200,89 +2215,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr "Neplatná metadata"
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Nelze '%(action)s' zatímco instance je %(attr)s %(state)s"
 
 #: nova/api/openstack/common.py:366
+#, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "Instance je v neplatném stavu pro '%(action)s'"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Odmítnutí žádosti o snímek, snímky jsou nyní zakázány"
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Snímky instance nejsou v sou�asnosti povoleny."
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Na�teno rozšíření: %s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr "Název roz: %s"
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Přezdívká roz: %s"
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr "Popis roz: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Jmenný prostor roz: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Roz aktualizováno: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "Výjimka při na�ítání rozšíření: %s"
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Na�ítání rozšíření %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "Volání továrny rozšíření %s"
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Nelze na�ít rozšížení %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Nelze na�íst rozšíření %(classpath)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Nelze na�íst rozšíření %(ext_name)s: %(exc)s"
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr "JSON nelze porozumět"
@@ -2330,6 +2363,7 @@ msgstr "Žádná taková �innost: %s"
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr "Poškozené tělo požadavku"
 
@@ -2378,7 +2412,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr "podtřídy musí zavádět construct()!"
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr "Zavádění správce rozšíření."
 
@@ -2734,9 +2768,9 @@ msgstr "Požadavek na změnu velikosti vyžaduje vlastnost 'flavorRef'."
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr "Neplatné tělo požadavku"
@@ -2798,6 +2832,7 @@ msgstr "Compute.api::reset_sítě %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr "Server nenalezen"
 
@@ -2965,7 +3000,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr "Může být získán pouze kořenový certifikát."
 
@@ -3009,34 +3045,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp není spuštěno"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Neplatný snímek"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Bezpe�nostní skupina %s již existuje"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, fuzzy, python-format
 msgid "Coverage doesn't have %s action"
 msgstr "Síť nemá �innost %s"
@@ -3047,27 +3083,30 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s musí být bu� 'MANUAL' nebo 'AUTO'."
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host a block_migration musí být zadány."
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Chyba v přesunu %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "Certifikát %(certificate_id)s nenalezen."
@@ -3118,7 +3157,7 @@ msgstr "Plovoucí ip %(address)s není přidružena."
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr "Chybí parametr dict"
 
@@ -3369,30 +3408,36 @@ msgid "Create networks failed"
 msgstr "Vytvoření selhalo"
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3404,7 +3449,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr "Poškozená vlasnost scheduler_hints"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Není dostatek parametrů k sestavení platného pravidla."
 
@@ -3423,16 +3468,16 @@ msgstr "Zobrazování sítě s id %s"
 msgid "security group default rule not found"
 msgstr "Bezpe�nostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Špatná předpona pro to_global_ipv6: %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "Není zadána bezpe�nostní skupina"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "Název bezpe�nostní skupiny nemůže být prázdné"
 
@@ -3518,12 +3563,17 @@ msgstr "Na�teno rozšíření: %s"
 msgid "Ext version: %i"
 msgstr "Popis roz: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Uvolnit adresu %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Uvolnit adresu %s"
@@ -3606,39 +3656,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3653,28 +3703,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
@@ -3733,17 +3783,17 @@ msgstr "Spouštění VPN pro %s"
 msgid "Failed to load %s"
 msgstr "Nelze vytvořit svazek"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "prvek není podřazený"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4117,26 +4167,26 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "Překro�ena kvóta instancí. Nemůžete spustit další instance tohoto typu."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Překro�ena kvóta instancí. Můžete spustit pouze %s dalších instancí "
 "tohoto typu."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "Překro�ena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -4145,99 +4195,99 @@ msgstr ""
 "Překro�ena kvóta pro %(pid)s, pokus o nastavení %(num_metadata)s "
 "vlastností metadat"
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 #, fuzzy
 msgid "Metadata property key greater than 255 characters"
 msgstr "Bezpe�nostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 #, fuzzy
 msgid "Metadata property value greater than 255 characters"
 msgstr "Bezpe�nostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Nelze připojit svazek k instanci %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Chystá se spuštění %s instancí..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "BUde spuštěno ukon�ování insatncí"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance typu %(instance_type_id)s nemohla být nalezena."
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "BUde spuštěno ukon�ování insatncí"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "Žádný hostitel pro instnaci %s, okamžitě smazána"
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Pokus o jemné smazání %s"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Pokus o ukon�ení %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Pokus o zastavení %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Pokus o spuštění %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr "Hledání podle: %s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Spouštění snímku ve VM %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id je None. Předpokládán přesun."
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4246,63 +4296,63 @@ msgstr ""
 "Stará instance typu %(current_instance_type_name)s, nová instance typu "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "Překro�ena kvóta pro %(pid)s, pokus o spuštění %(min_count)s instancí"
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Pokus o ukon�ení %s"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Dvojice klí�ů musí být dlouhá 1 až 255 znaků."
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "Bezpe�nostní skupina %s není řetězec nebo unicode"
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Bezpe�nostní skupina %s nemůže být prázdná."
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4311,70 +4361,70 @@ msgstr ""
 "Hodnota (%s) parametru GroupName je neplatná. Délka překra�uje maximum "
 "255 znaků."
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "Bezpe�nostní skupina %s by neměla být větší než 255 znaků."
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Vytvořit bezpe�nostní skupinu %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Bezpe�nostní skupina %s již existuje"
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Nelze zni�it vbd %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nelze zni�it vbd %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Id bezpe�nostní skupiny by mělo být celé �íslo"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Pravidlo (%s) nenalezeno"
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Přidávání pravidla bezpe�nostní skupiny: %r"
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Povolit přístup bezpe�nostní skupiny %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Zrušit přístup bezpe�nostní skupiny %s"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr "Id bezpe�nostní skupiny by mělo být celé �íslo"
 
@@ -4439,13 +4489,13 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than or equal to 0"
-msgstr "Vlastnost createBackup 'rotation' musí být celé �íslo"
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
 
 #: nova/compute/flavors.py:119
 #, fuzzy
@@ -4470,16 +4520,16 @@ msgstr "Instance typu %s není nalezena ke smazání"
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4488,241 +4538,241 @@ msgstr ""
 "Nelze přesunout instanci (%(instance_id)s) na sou�asného hostitele "
 "(%(host)s)."
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Nelze restartovat instanci"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Sou�asný stav je %(drv_state)s, stav v DB je %(db_state)s."
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Restartování instance po restartu nova-compute."
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Ovlada� hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Ovlada� hypervizoru nepodporuje pravidla firewallu"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Neo�ekávaný kód stavu"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr "Kontrola stavu"
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Nastavování bdm %s"
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr "Spouštění instance..."
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Nenalezeny žádné plovoucí ip"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr "Instance selhala v nastavení sítě"
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Informace o síti instance: |%s|"
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr "Instance selhala nastavení blokového zařízení"
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr "Instance nemohla být spuštěna"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Navrácení sítě pro instnac"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s nstance"
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignorování DiskNenalezen: %s"
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr "ukon�ování bdm %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Nastavování stavu vm instance na ERROR"
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Znovu sestavování instance %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s je ve sdíleném úložišti: %(reason)s"
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Vytvořit snímek ze svazku %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Restartování instance %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4731,26 +4781,26 @@ 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:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: znovu zavedena"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: pořizování snímku"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4759,231 +4809,231 @@ 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:1973
+#: nova/compute/manager.py:1987
 #, 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:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Střídání %d záloh"
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr "Mazání obrazu %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, 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:2021
+#: nova/compute/manager.py:2035
 #, fuzzy
 msgid "Root password set"
 msgstr "Instance %s: Nastavení hesla root"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 #, 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:2043
+#: nova/compute/manager.py:2057
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password není tímto ovlada�em zavedeno"
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Chyba při nastavování hesla správce"
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nelze pozastavit instanci"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Chyba DB: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: rušení záchrany"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance nemá svazek."
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr "cíl stejný jako zdroj!"
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 #, fuzzy
 msgid "Pausing"
 msgstr "Aktualizování!"
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: získávání diagnostik"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "Reset sítě"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 #, fuzzy
 msgid "Inject network info"
 msgstr "instance %s: vkládání informací o síti"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info vkládá: |%s|"
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "instance %s: získávání konzole vnc"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, 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:3055
+#: nova/compute/manager.py:3068
 #, 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:3065
+#: nova/compute/manager.py:3078
 #, 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:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, 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:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Odpojování svazku z neznámé instance %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, 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:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "zahájen přesun po spuštění."
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4991,21 +5041,21 @@ 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:3477
+#: nova/compute/manager.py:3490
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Spuštěna operace po migraci"
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Nelze získat metadata pro ip: %s"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -5014,64 +5064,64 @@ msgstr ""
 "Nalezeno %(migration_count)d nepotvrzených přesunů starších než "
 "%(confirm_window)d vteřin"
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, 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:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Aktualizace mezipaměti využití šířky pásma"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr "Aktualizace stavu hostitele"
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5080,86 +5130,86 @@ msgstr ""
 "Nalezeno %(num_db_instances)s v databázi a %(num_vm_instances)s na "
 "hypervizoru."
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance není zapnuta"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, překskování..."
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr "Znovu získávání smazané instance"
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Zaznamování ovlada�e svazku: %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "Žádná služba pro ID výpo�tu %s"
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
@@ -5281,16 +5331,37 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, fuzzy, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+"Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek paměti "
+"(hostitel:%(avail)s <= instance:%(mem_inst)s)"
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "Přidávání konzole"
@@ -5372,7 +5443,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Nelze restartovat instanci"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5432,7 +5503,7 @@ msgstr "instance %s: zachráněna"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -6069,80 +6140,80 @@ msgstr "Špatný formát sítě"
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Plovoucí ip není nalezena pro id %(id)s."
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Zachycena chyba: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Id bezpe�nostní skupiny by mělo být celé �íslo"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Smazat bezpe�nostní skupinu %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Zachycena chyba: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Bezpe�nostní skupina s pravidlem %(rule_id)s nenalezena."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Bezpe�nostní skupina %(security_group_id)s není nalezena v projektu "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6171,7 +6242,7 @@ msgstr "Neplatný  server_string: %s"
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6441,11 +6512,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, fuzzy, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr "Nelze na�íst rozšíření %(classpath)s: %(exc)s"
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6885,88 +6951,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "Běží odpovídající služba?"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "Nelze najít další výpo�et"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Nastavování instance %(instance_uuid)s do stavu ERROR"
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, fuzzy, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-"Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek paměti "
-"(hostitel:%(avail)s <= instance:%(mem_inst)s)"
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "Pokus o sestavení %(num_instances)d instancí"
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "Požadavek: %s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Svazek není nalezen v instanci %(instance_id)s."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Filtrováno %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "Filtrováno %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -7003,23 +7060,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr "Obdržena aktualizace služby %(service_name)s od %(host)s."
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, fuzzy, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr "Obdržena aktualizace služby %(service_name)s od %(host)s."
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "Žádná služba pro ID výpo�tu %s"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Nelze naplánovat_%(method)s: %(ex)s"
@@ -7029,10 +7086,10 @@ msgstr "Nelze naplánovat_%(method)s: %(ex)s"
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr "Nelze vyhodnotit soubor voleb plánova�e %(filename)s: '%(e)s'"
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "Nelze dekódovat volby plánova�e: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
@@ -7055,7 +7112,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7334,43 +7391,45 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "Spouštění instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Po ukon�ení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr "Vnitřní chyba"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Po vynuceném ukon�ení instancí: %s"
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 #, fuzzy
 msgid "spawn error"
 msgstr "neznámá chyby připojení hosta"
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7503,12 +7562,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Vytváření souborů v %s pro simulaci agenta hosta"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
@@ -7518,25 +7577,25 @@ msgstr "Odstraňování souborů simulovaného agenta hosta v %s"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "Zaznamování ovlada�e svazku: %s"
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Nelze na�íst ovlada� virtualizace: %s"
@@ -7546,7 +7605,7 @@ msgstr "Nelze na�íst ovlada� virtualizace: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "Pokus o odfiltrování instance, která není filtrována"
 
@@ -7601,37 +7660,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Získávání seznamu instancí"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7682,85 +7741,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Přidělení plovoucí IP pro |%s|"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Stahování obrazu %s ze serveru obrazu glance"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, fuzzy, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr "Při �ekání na odpově� RPC vypršel �asový limit."
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "přidělování sítě pro instanci %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Získat výstup konzole pro instanci %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr "Uzel je v neznámém chybovém stavu."
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Nelze najít hostitele pro instanci %s"
@@ -7860,12 +7919,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, fuzzy, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr "Nelze zjistit název zavadě�e iscsi"
@@ -7875,7 +7934,7 @@ msgstr "Nelze zjistit název zavadě�e iscsi"
 msgid "No fixed PXE IP is associated to %s"
 msgstr "K instanci nejsou přidruženy žádné pevné ip"
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7889,23 +7948,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "Žádné další plovoucí ip nejsou dostupné."
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "nenalezeny žádné oddíly"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Vytvoření virtuálního rozhraní selhalo"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "nenalezeny žádné oddíly"
@@ -8018,12 +8072,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8280,12 +8334,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Nelze aktualizovat agenta: %(resp)r"
@@ -8314,23 +8368,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Získat výstup konzole pro instanci %s"
@@ -8344,7 +8398,7 @@ msgstr "Verze agenta instance: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Aktualizace statistik hostitele"
@@ -8710,12 +8764,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Přidělení plovoucí IP pro |%s|"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Vkládání cesty souboru: '%s'"
@@ -8881,7 +8935,7 @@ msgstr "Připojeni svazku: %(connection_info)s, %(instance_name)s, %(mountpoint)
 msgid "Detaching physical disk from instance: %s"
 msgstr "Vytváření snímku instance VM %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr "Nelze zjistit název zavadě�e iscsi"
 
@@ -8920,248 +8974,248 @@ msgstr "Neůze najít vbd pro vdi %s"
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "skupina svazku %s neexistuje"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Připojení k libvirt poškozeno"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Připojování k libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během ni�ení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr "Instance úspěšně zni�ena."
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Instance budou zastaveny"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během rušení ur�ení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "Chyba od libvirt během rušení ur�ení. Kód=%(errcode)s Chyba=%(e)s"
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
-msgstr "Mazání souborů instance %(target)s"
+msgid "Deleting instance files %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Nelze naplánovat_%(method)s: %(ex)s"
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "Nelze zjistit název zavadě�e iscsi"
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "Nelze zjistit název zavadě�e iscsi"
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Źádné sítě nejsou ur�eny."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "Při spuštění wait zmizelo %s."
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Źádné sítě nejsou ur�eny."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Nelze restartovat instanci"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr "Instance úspěšně restartována."
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr "Instance je spuštěna"
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "Instance úspěšně vytvořena."
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Uživatel nemá správcovská oprávnění"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr "Vytváření obrazu"
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Vkládání %(injection)s do obrazu %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "Ignorování chyby při vkládání dat do obrazu %(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9169,19 +9223,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9190,33 +9244,33 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9225,25 +9279,25 @@ msgstr ""
 "Nelze získat po�et cpu, protože tato funkce není na této platformě "
 "zavedena. Tuto chybu lze prozatím bezpe�ně ignorovat."
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "verze libvirt je příliš stará (nepodporuje getVersion)"
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Získávání velikosto brazu %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9251,21 +9305,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9274,16 +9328,16 @@ msgstr ""
 "Vytváření do�asného souboru %s pro informování ostatních po�íta�ových "
 "uzlů, že by se měli připojit ke stejnému úložišti."
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr "Přesunutí bloku nemůže být použito ve sdíleném úložišti."
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "Přesunutí bloku nemůže být použito ve sdíleném úložišti."
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9292,7 +9346,7 @@ msgstr ""
 "Nelze přesunout %(instance_id)s do %(dest)s: Nedostatek disku  "
 "(hostitel:%(available)s <= instance:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9301,7 +9355,7 @@ msgstr ""
 "Spuštěná instance má info o CPU:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9316,7 +9370,7 @@ msgstr ""
 "\n"
 "Prohlédněte si %(u)s"
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9325,24 +9379,24 @@ msgstr ""
 "Vytváření do�asného souboru %s pro informování ostatních po�íta�ových "
 "uzlů, že by se měli připojit ke stejnému úložišti."
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Přesun před spuštěním selhal na %(dest)s"
+#: nova/virt/libvirt/driver.py:3332
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 "plug_vifs() selhalo %(cnt)d.opakování až na %(max_retry)d pro "
 "%(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9351,45 +9405,45 @@ msgstr ""
 "Chyba od libvirt při hledání %(instance_name)s: [Kód chyby "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
-msgstr "přeskakování %(path)s protože vypadá jako svazek"
+msgid "skipping %s since it looks like volume"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Instance %s: Spouštění přesunu disku a vypnutí"
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Instance %s úspěšně běží."
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "Instance %s: Spouštění dokon�ení přesunu"
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "Instance %s: Spuštění doko�ení vrácení přesunu"
 
-#: nova/virt/libvirt/driver.py:3915
-#, fuzzy, python-format
-msgid "Checking instance files accessability%(instance_path)s"
-msgstr "Mazání souborů instance %(target)s"
+#: nova/virt/libvirt/driver.py:3942
+#, python-format
+msgid "Checking instance files accessability %s"
+msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
 msgid ""
@@ -9409,15 +9463,15 @@ msgstr "Zajišťování statických filtrů"
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr "Nwfilter (%(instance_filter_name)s) nenalezen."
+msgid "The nwfilter(%s) is not found."
+msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "Nwfilter (%(instance_filter_name)s) pro %(name)s nenalezen."
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Nastavení základního filtrování"
 
@@ -9616,48 +9670,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Neo�ekávaná chyba: %s"
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "Zajišťování vlan %(vlan)s a mostu %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "Zajišťování mostu %s"
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 #, fuzzy
 msgid "Failed while unplugging vif"
 msgstr "Nelze při odpojení vif instance '%s'"
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9665,7 +9719,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9673,7 +9727,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9681,7 +9735,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9903,7 +9957,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -10053,32 +10107,32 @@ msgstr ""
 "Pro useconnection_type=vmwareapi musíte zadat "
 "vmwareapi_host_ip,vmwareapi_host_username a vmwareapi_host_password"
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "zna�ka [%s] nenalezena"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "In vmwareapi:_create_session, obdržena tato výjimka: %s"
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "In vmwareapi:_call_method, obdržena tato výjimka: %s"
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "Úkol [%(task_name)s] %(task_ref)s stav: úspěch"
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "Úkol [%(task_name)s] %(task_ref)s stav: chyba %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "In vmwareapi:_poll_task, Obdržena tato chyba %s"
@@ -10093,34 +10147,34 @@ msgstr "Při volání RetrieveProperties se událo %s chyb"
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, fuzzy, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "Vlastnost %(attr)s nenastavena pro spravovaný objekt %(objName)s"
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr "Není registrováno žádné VM"
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "Virtuální stroj s ref %s neexistuje"
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "Odhlašování sezení, které je neplatné, nebo už odhlášené: %s"
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr "Sezení je chybné"
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "Sezení je neplatné"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " Žádné virtuální stroje nebyly zatím registrovány"
@@ -10367,12 +10421,12 @@ msgstr "Provádění tvrdho restártu VM %s"
 msgid "Did hard reboot of VM"
 msgstr "Proveden tvrdý restart VM %s"
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Restartování xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Registrace VM %s zrušena"
@@ -10495,109 +10549,109 @@ msgstr "Vypínání VM %s"
 msgid "Powered on the VM"
 msgstr "VM %s vypnuto"
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Aktualizace postupu instance '%(instance_uuid)s' na %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Mazání svazku s ID: %s "
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instance - %s není přítomno"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr "Ve vmwareapi:vmops:destroy, obdržena výjimka při rušení registrace VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Mazání svazku s ID: %s "
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Vytvořit svazek ze snímku %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 "Nalezeno %(instance_count)d zaseknutých restartování starších než "
 "%(timeout)d vteřin"
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "Automatický tvrdý restart %d"
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics není zavedeno pro vmwareapi"
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 #, fuzzy
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr "Znovu nastavování instance VM %s pro připojení obrazu disku"
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 #, fuzzy
 msgid "Reconfigured VM instance to set the machine id"
 msgstr "Instance VM %s znovu nastavena pro připojení obrazu disku"
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, fuzzy, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 "Znovu nastavování instance VM %(name)s pro úpravu id stroje s ip - "
 "%(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, fuzzy, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 "Instance VM %(name)s znovu nastavena pro úpravu id stroje s ip - "
 "%(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Vytváření adresáře s cestou %s"
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Vytvořen adresář s cestou %s"
@@ -10720,14 +10774,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:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, 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:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10736,74 +10790,55 @@ msgstr ""
 "NEZAVEDENO: Volání %(method)s není agentem podporováno. VM "
 "id=%(instance_uuid)s; arg=%(args)r"
 
-#: nova/virt/xenapi/agent.py:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, 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."
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr "Dotaz na verzi agenta"
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Aktualizace agenta na %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "Nastavování správcovského hesla"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Vkládání cesty souboru: '%s'"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr "Reset sítě"
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
@@ -10811,7 +10846,7 @@ msgstr ""
 "Nástroje XenServer instalované v tomto obrazu jsou schopné vložit sítě. "
 "Síťové soubory nebudou změněny"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
@@ -10819,15 +10854,15 @@ msgstr ""
 "Nástroje XenServer jsou v tomto obrazu přítomny, ale nejsou schopny "
 "vložit síť"
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr "Nástroje XenServer nejsou v tomto obrazu nainstalovány"
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Chyba OpenSSL: %s"
@@ -10846,54 +10881,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Nelze dešifrovat soukromý klí�: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr "Spuštění hostitele na XenServer není podporováno."
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "Nelze se přihlásit do XenAPI (je disk Dom0 plný?)"
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obdržena výjimka: %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "Oznamování NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake nemá zavedeno %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Volání pro získání %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11826,9 +11861,3 @@ msgstr "stav musí být dostupný"
 msgid "status must be 'available'"
 msgstr "stav musí být dostupný"
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr "Certifikát %(certificate_id)s nenalezen."
-
-#~ msgid "quantum authentication failed"
-#~ msgstr "Chyba ověření"
-
diff --git a/nova/locale/da/LC_MESSAGES/nova.po b/nova/locale/da/LC_MESSAGES/nova.po
index bc66f7c47..77fa877a0 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1383,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1413,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1709,261 +1724,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2133,89 +2148,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2263,6 +2296,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2309,7 +2343,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2651,9 +2685,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2715,6 +2749,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2875,7 +2910,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2915,32 +2951,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2951,26 +2987,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3018,7 +3057,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3257,30 +3296,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3292,7 +3337,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3309,16 +3354,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3401,12 +3446,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3489,38 +3539,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3535,28 +3585,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3615,17 +3665,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3983,244 +4033,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4284,12 +4334,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4314,653 +4364,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5080,15 +5130,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5167,7 +5236,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5226,7 +5295,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5841,75 +5910,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,7 +6004,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6202,11 +6271,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6631,86 +6695,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6745,23 +6802,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6771,9 +6828,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6797,7 +6854,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7074,42 +7131,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7236,12 +7295,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7251,25 +7310,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7278,7 +7337,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7332,37 +7391,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7410,85 +7469,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7585,12 +7644,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7600,7 +7659,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7614,22 +7673,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7742,12 +7797,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8000,12 +8055,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8034,23 +8089,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8063,7 +8118,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8415,12 +8470,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8578,7 +8633,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8617,237 +8672,237 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "bind %s: slettet"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/de/LC_MESSAGES/nova.po b/nova/locale/de/LC_MESSAGES/nova.po
index aa9903822..94e00569b 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,86 +378,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "Instanz %s: Rettung"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "keine Methode für diese Nachricht gefunden: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,262 +1725,262 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "Instanz %s: Rettung"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2135,89 +2150,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2265,6 +2298,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2311,7 +2345,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2654,9 +2688,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2718,6 +2752,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2879,7 +2914,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2920,32 +2956,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2956,26 +2992,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "Instanz %s pausiert"
@@ -3024,7 +3063,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3263,30 +3302,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3298,7 +3343,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3360,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3407,12 +3452,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3495,39 +3545,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3542,28 +3592,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3622,17 +3672,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3991,245 +4041,245 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4293,12 +4343,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4323,660 +4373,660 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Volume %s: erstelle Export"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instanz %s: Rettung"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5096,15 +5146,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5183,7 +5252,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5242,7 +5311,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5858,75 +5927,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5952,7 +6021,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6220,11 +6289,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6649,86 +6713,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Einhängepunkt%(mountpoint)s  zur Instanze %(instance_name)s hinzugefügt"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6763,23 +6820,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6789,9 +6846,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6815,7 +6872,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7092,42 +7149,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7254,12 +7313,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7269,25 +7328,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7296,7 +7355,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7350,37 +7409,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7433,85 +7492,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7608,12 +7667,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7623,7 +7682,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7637,22 +7696,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "Instanz %s pausiert"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7765,12 +7820,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8023,12 +8078,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Nicht möglich volume %s zufinden"
@@ -8057,23 +8112,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8086,7 +8141,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8438,12 +8493,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8603,7 +8658,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr "Nicht möglich Volumen zur Instanze %s hinzuzufügen"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8642,237 +8697,237 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "Volume %s: erfolgreich erstellt"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8880,76 +8935,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8957,50 +9012,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9010,69 +9065,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9091,15 +9146,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9290,47 +9345,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9338,7 +9393,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9346,7 +9401,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9354,7 +9409,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9565,7 +9620,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9711,32 +9766,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9751,34 +9806,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9990,11 +10045,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10099,101 +10154,101 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "Instanz %s: Rettung"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Nicht möglich volume %s zufinden"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10316,106 +10371,87 @@ msgstr "Nicht möglich volume %s zufinden"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10431,54 +10467,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11367,9 +11403,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/en_AU/LC_MESSAGES/nova.po b/nova/locale/en_AU/LC_MESSAGES/nova.po
index e01cb783b..28187622e 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -80,301 +80,301 @@ msgstr "Going to start terminating instances"
 msgid "Flags path: %s"
 msgstr "Flags path: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "instance %s: booted"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "no method for message: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Invalid signature for user %s"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -382,86 +382,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: rescued"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -469,897 +469,912 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "setting network host"
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "instance %(instance_name)s: deleting instance files %(target)s"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "setting network host"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "volume group %s doesn't exist"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Going to start terminating instances"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Could not attach image to loopback: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Going to try to terminate %s"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Going to try to terminate %s"
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "instance %s: booted"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "group %s already exists"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1374,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Failed to get metadata for ip: %s"
@@ -1405,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1719,265 +1734,265 @@ msgstr "An unknown error has occurred. Please try your request again."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Unsupported API request: controller = %(controller)s, action = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Not enough parameters to build a valid rule."
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "This rule already exists in group %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: rescued"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2147,89 +2162,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2277,6 +2310,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2323,7 +2357,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2671,9 +2705,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2735,6 +2769,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2898,7 +2933,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2940,33 +2976,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp not running..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2977,26 +3013,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "setting network host"
@@ -3045,7 +3084,7 @@ msgstr "group %s already exists"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3288,30 +3327,36 @@ msgid "Create networks failed"
 msgstr "setting network host"
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3323,7 +3368,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Not enough parameters to build a valid rule."
 
@@ -3341,16 +3386,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3435,12 +3480,17 @@ msgstr "Got exception: %s"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Release address %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Release address %s"
@@ -3523,39 +3573,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Going to start terminating instances"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Going to start terminating instances"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3570,28 +3620,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
@@ -3650,17 +3700,17 @@ msgstr "Launching VPN for %s"
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4026,253 +4076,253 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Instance quota exceeded. You can only run %s more instances of this type."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "instance %s: booted"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Starting snapshot for VM %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorise security group ingress %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4337,12 +4387,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4367,674 +4417,674 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected error raised: %s"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "setting network host"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Going to try to terminate %s"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: unrescuing"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 #, fuzzy
 msgid "Inject network info"
 msgstr "setting network host"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adding console"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: booted"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5154,15 +5204,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "Adding console"
@@ -5242,7 +5311,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5301,7 +5370,7 @@ msgstr "instance %s: rescued"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5921,78 +5990,78 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "setting network host"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revoke security group ingress %s"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Authorise security group ingress %s"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6018,7 +6087,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6285,11 +6354,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6719,86 +6783,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Going to start terminating instances"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6833,23 +6890,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6859,9 +6916,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6885,7 +6942,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7162,42 +7219,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7325,12 +7384,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7340,25 +7399,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7367,7 +7426,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7421,37 +7480,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7504,85 +7563,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Going to start terminating instances"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Going to start terminating instances"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Get console output for instance %s"
@@ -7679,12 +7738,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7694,7 +7753,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7708,22 +7767,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "instance %s: booted"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7840,12 +7895,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8099,12 +8154,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Failed to mount filesystem: %s"
@@ -8133,23 +8188,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Get console output for instance %s"
@@ -8163,7 +8218,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8519,12 +8574,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Going to start terminating instances"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Injecting file path: '%s'"
@@ -8690,7 +8745,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creating a raw instance"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8729,240 +8784,240 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "volume group %s doesn't exist"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Going to try to terminate %s"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: rebooted"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 "instance %(inst_name)s: ignoring error injecting data into image "
 "%(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8970,76 +9025,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Failed to get metadata for ip: %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9047,50 +9102,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9100,69 +9155,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Authentication Failure: %s"
+#: nova/virt/libvirt/driver.py:3332
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9181,15 +9236,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9380,47 +9435,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9428,7 +9483,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9436,7 +9491,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9444,7 +9499,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9656,7 +9711,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9802,32 +9857,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9842,34 +9897,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10083,12 +10138,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Restarting xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested return %s"
@@ -10196,101 +10251,101 @@ msgstr "Going to run %s instances..."
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "instance %s: booted"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Deleting user %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instance %s: rescued"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Deleting user %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10413,106 +10468,87 @@ 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:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Calling getter %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Injecting file path: '%s'"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -10532,54 +10568,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Failed to decrypt private key: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11481,9 +11517,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/en_GB/LC_MESSAGES/nova.po b/nova/locale/en_GB/LC_MESSAGES/nova.po
index c18156ebb..922f9558f 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,160 +79,160 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr "Flags path: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Virtual Interface creation failed"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "5 attempts to create virtual interface with unique mac address failed"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Not authorised."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "User does not have admin privileges"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Policy doesn't allow %(action)s to be performed."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Unacceptable parameters."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volume %(volume_id)s is not attached to anything"
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "The request is invalid."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Invalid input received"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -241,16 +241,16 @@ msgstr ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -259,123 +259,123 @@ msgstr ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "VBD not found in instance %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -383,86 +383,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: resuming"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -470,896 +470,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Mountpoint %(mountpoint)s attached to instance %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1374,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1404,17 +1419,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1715,262 +1730,262 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: resuming"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Invalid cidr %(cidr)s."
@@ -2142,89 +2157,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2272,6 +2305,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2318,7 +2352,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2663,9 +2697,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2727,6 +2761,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2888,7 +2923,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2930,33 +2966,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Invalid snapshot"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2967,26 +3003,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "instance %s: suspending"
@@ -3035,7 +3074,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3275,30 +3314,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3310,7 +3355,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3327,16 +3372,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3419,12 +3464,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3507,39 +3557,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3554,28 +3604,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Instance %(instance_id)s is not running."
@@ -3634,17 +3684,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4005,246 +4055,246 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach volume to instance %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Virtual Interface creation failed"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy VBD %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4309,12 +4359,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4339,667 +4389,667 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "volume %s: creating export"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Rebooting instance %s"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: retrieving diagnostics"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "instance %s: reset network"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output for instance %s"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: snapshotting"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Invalid instance type %(instance_type)s."
@@ -5119,15 +5169,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5207,7 +5276,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5266,7 +5335,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5883,75 +5952,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5977,7 +6046,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6245,11 +6314,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6680,86 +6744,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Invalid instance type %(instance_type)s."
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6794,23 +6851,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6820,9 +6877,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6846,7 +6903,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7123,42 +7180,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7285,12 +7344,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7300,25 +7359,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7327,7 +7386,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7381,37 +7440,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7464,85 +7523,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Invalid instance type %(instance_type)s."
@@ -7639,12 +7698,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7654,7 +7713,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7668,22 +7727,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "instance %s: suspending"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Virtual Interface creation failed"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7796,12 +7851,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8055,12 +8110,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Unable to locate volume %s"
@@ -8089,23 +8144,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Get console output for instance %s"
@@ -8119,7 +8174,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8475,12 +8530,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8646,7 +8701,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8685,238 +8740,238 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connection to melange failed"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: created successfully"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "User does not have admin privileges"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Asking xapi to upload %(vdi_uuids)s as ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8924,76 +8979,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Unable to detach volume %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9001,50 +9056,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9054,69 +9109,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9135,15 +9190,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9334,47 +9389,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9382,7 +9437,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9390,7 +9445,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9398,7 +9453,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9611,7 +9666,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9758,32 +9813,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9798,34 +9853,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10037,11 +10092,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested return %s"
@@ -10147,101 +10202,101 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instance %s: resuming"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Re-exporting %s volumes"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Unable to locate volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10364,106 +10419,87 @@ 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:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Calling getter %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10479,54 +10515,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11422,9 +11458,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/en_US/LC_MESSAGES/nova.po b/nova/locale/en_US/LC_MESSAGES/nova.po
index 86271c179..6fd988d9c 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -81,161 +81,161 @@ msgstr "Failed to terminate instance"
 msgid "Flags path: %s"
 msgstr "Flags path: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "An unknown exception occurred."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr "Exception in string format operation"
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr "Unknown"
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Failed to decrypt text"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Virtual Interface creation failed"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "5 attempts to create virtual interfacewith unique mac address failed"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Not authorized."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "User does not have admin privileges"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Policy doesn't allow %(action)s to be performed."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Image %(image_id)s is not active."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Not authorized for image %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Unacceptable parameters."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 #, fuzzy
 msgid "Block Device Mapping is Invalid."
 msgstr "block_device_mapping %s"
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volume %(volume_id)s is not attached to anything"
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Keypair data is invalid"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "The request is invalid."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Invalid input received"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Invalid volume"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "Invalid metadata"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr "Invalid metadata size"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Invalid content type %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Invalid Parameter: Unicode is not supported by the current database."
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -244,16 +244,16 @@ msgstr ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Group not valid. Reason: %(reason)s"
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr "Sort key supplied was not valid."
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -262,85 +262,85 @@ msgstr ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Instance %(instance_id)s is not running."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Instance %(instance_id)s is not ready"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Failed to suspend instance"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Failed to reset network: %(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Failed to set admin password on %(instance)s because %(reason)s"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Failed to set admin password on %(instance)s because %(reason)s"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Failed to reboot instance"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr "Failed to terminate instance"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Failed to reboot instance"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Service is unavailable at this time."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr "Insufficient compute resources."
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Compute service is unavailable at this time."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "The supplied hypervisor type of is invalid."
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "The instance requires a newer hypervisor version than has been provided."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -349,31 +349,31 @@ msgstr ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "The supplied device path (%(path)s) is invalid."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "The supplied device path (%(path)s) is in use."
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "The supplied device (%(device)s) is busy."
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Unacceptable CPU info"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s is not a valid IP v4/6 address."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -382,7 +382,7 @@ msgstr ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -393,85 +393,85 @@ msgstr ""
 "the desired physical adapter. Expected vSwitch is %(expected)s, but the "
 "one associated is %(actual)s."
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Disk format %(disk_format)s is not acceptable"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Image %(image_id)s is unacceptable: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Instance %(instance_id)s is unacceptable: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s is unacceptable."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr "Expected a uuid but received %(uuid)s."
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Invalid cidr %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr "Constraint not met."
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Resource could not be found."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "No fixed IP associated with id %(id)s."
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Volume %(volume_id)s could not be found."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Snapshot %(snapshot_id)s could not be found."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "No target id found for volume %(volume_id)s."
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "No disk at %(location)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Could not find a handler for %(driver_type)s volume."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Invalid image href %(image_href)s."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Image %(image_id)s could not be found."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -482,65 +482,65 @@ msgstr ""
 " dynamically when they are listed for the first time. Have you listed "
 "image ids since adding this image?"
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Project %(project_id)s could not be found."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "Cannot find SR to read/write VDI."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Network %(network_id)s is still in use."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Network %(network_id)s is still in use."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s is required to create a network."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Network %(network_id)s could not be found."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Port %(port_id)s could not be found."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Network could not be found for bridge %(bridge)s"
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Network could not be found for uuid %(uuid)s"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Network could not be found with cidr %(cidr)s."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Network could not be found for instance %(instance_id)s."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "No networks defined."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -549,51 +549,51 @@ msgstr ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "Could not find the datastore reference(s) which the VM uses."
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Port %(port_id)s is still in use."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Network could not be found for instance %(instance_id)s."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "Network could not be found for instance %(instance_id)s."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "No fixed IP associated with id %(id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Fixed ip not found for address %(address)s."
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Instance %(instance_uuid)s has zero fixed ips."
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "Network host %(host)s has zero fixed ips in network %(network_id)s."
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
@@ -602,7 +602,7 @@ msgstr ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
@@ -611,116 +611,116 @@ msgstr ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr "More than one instance is associated with fixed ip address '%(address)s'."
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "Fixed IP address %(address)s is invalid."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "Zero fixed ips available."
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "Zero fixed ips could be found."
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Floating ip %(address)s already exists."
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Floating ip not found for id %(id)s."
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "The DNS entry %(name)s already exists in domain %(domain)s."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Floating ip not found for address %(address)s."
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Floating ip not found for host %(host)s."
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "Multiple floating ips are found for address %(address)s."
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr "Floating ip pool not found."
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "Zero floating ips available."
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "Floating ip %(address)s is associated."
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "Floating ip %(address)s is not associated."
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "Zero floating ips exist."
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s not found."
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr "Cannot disassociate auto assigined floating ip"
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "Keypair %(name)s not found for user %(user_id)s"
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Service %(service_id)s could not be found."
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s could not be found."
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Compute host %(host)s could not be found."
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Could not find binary %(binary)s on host %(host)s."
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
@@ -729,56 +729,56 @@ msgstr ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Quota could not be found"
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "Unknown quota resources %(unknown)s."
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Quota for project %(project_id)s could not be found."
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Quota class %(class_name)s could not be found."
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Quota usage for project %(project_id)s could not be found."
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Quota reservation %(uuid)s could not be found."
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Quota exceeded for resources: %(overs)s"
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Security group %(security_group_id)s not found."
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr "Security group %(security_group_id)s not found for project %(project_id)s."
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -787,7 +787,7 @@ msgstr ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -796,37 +796,37 @@ msgstr ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Migration %(migration_id)s could not be found."
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Migration not found for instance %(instance_id)s with status %(status)s."
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Console pool %(pool_id)s could not be found."
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -835,17 +835,17 @@ msgstr ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Console %(console_id)s could not be found."
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Console for instance %(instance_uuid)s could not be found."
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
@@ -854,86 +854,86 @@ msgstr ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Invalid console type %(console_type)s "
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Instance type %(instance_type_id)s could not be found."
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Instance type with name %(instance_type_name)s could not be found."
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Flavor %(flavor_id)s could not be found."
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, fuzzy, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr "Flavor access not found for %(flavor_id) / %(project_id) combination."
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "pool %s doesn't exist"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 #, fuzzy
 msgid "Timeout waiting for response from cell"
 msgstr "Timed out waiting for RPC response: %s"
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Destroying VDIs for Instance %(instance_uuid)s"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "Scheduler Host Filter %(filter_name)s could not be found."
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -942,7 +942,7 @@ msgstr ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -951,63 +951,63 @@ msgstr ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "File %(file_path)s could not be found."
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr "Zero files could be found."
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "Virtual switch associated with the network adapter %(adapter)s not found."
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Network adapter %(adapter)s could not be found."
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Class %(class_name)s could not be found: %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "Action not allowed."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr "Rotation is not allowed for snapshots"
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr "Rotation param is required for backup image_type"
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "Key pair %(key_name)s already exists."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Instance %(name)s already exists."
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Instance Type with name %(name)s already exists."
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Instance Type with ID %(flavor_id)s already exists."
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
@@ -1016,81 +1016,81 @@ msgstr ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s is not on shared storage: %(reason)s"
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s is not on local storage: %(reason)s"
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "Migration error"
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "Migration error"
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Malformed message body: %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "Could not find config at %(path)s"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "Could not load paste app '%(name)s' from %(path)s"
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr "When resizing, instances must change flavor!"
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr "Instance type's memory is too small for requested image."
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr "Instance type's disk is too small for requested image."
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "Insufficient free memory on compute node to start %(uuid)s."
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Could not fetch bandwidth/cpu/disk metrics for this host."
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "No valid host was found. %(reason)s"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Quota exceeded"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
@@ -1099,41 +1099,41 @@ msgstr ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Maximum number of floating ips exceeded"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Maximum number of metadata items exceeds %(allowed)d"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr "Personality file limit exceeded"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr "Personality file path too long"
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr "Personality file content too long"
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr "Maximum number of key pairs exceeded"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Maximum number of security groups or rules exceeded"
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
@@ -1142,125 +1142,125 @@ msgstr ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "Aggregate %(aggregate_id)s could not be found."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "Aggregate %(aggregate_name)s already exists."
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "Aggregate %(aggregate_id)s has no host %(host)s."
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "Aggregate %(aggregate_id)s already has host %(host)s."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr "Unable to create instance type"
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "Failed to set admin password on %(instance)s because %(reason)s"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "Detected existing vlan with id %(vlan)d"
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Instance %(instance_id)s could not be found."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Console for instance %(instance_uuid)s could not be found."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Volume %(volume_id)s could not be found."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Port %(port_id)s could not be found."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Marker %(marker)s could not be found."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr "Invalid id: %(val)s (expecting \"i-...\")."
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Could not fetch image %(image_id)s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr "Task %(task_name)s is already running on host %(host)s"
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Task %(task_name)s is not running on host %(host)s"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Instance %(instance_uuid)s is locked"
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
@@ -1269,11 +1269,11 @@ msgstr ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr "User data needs to be valid base 64."
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
@@ -1282,19 +1282,19 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "Keypair %(name)s not found for user %(user_id)s"
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, fuzzy, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
@@ -1303,111 +1303,126 @@ msgstr ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "The CA file for %(project)s could not be found"
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "The CRL file for %(project)s could not be found"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password is not implemented by this driver."
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Instance %(instance_id)s is not in rescue mode"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Instance Type with name %(name)s already exists."
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Expected object of type: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1422,15 +1437,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Notifying Schedulers of capabilities ..."
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr "Failed to send state update notification"
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Failed to get info for disk %s"
@@ -1453,17 +1468,17 @@ msgstr "Created reservations %(reservations)s"
 msgid "Failed to commit reservations %(reservations)s"
 msgstr "Failed to commit reservations %(reservations)s"
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, fuzzy, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr "Created reservations %(reservations)s"
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr "Failed to roll back reservations %(reservations)s"
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, fuzzy, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr "Failed to roll back reservations %(reservations)s"
@@ -1769,224 +1784,224 @@ msgstr "An unknown error has occurred. Please try your request again."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Unsupported API request: controller = %(controller)s, action = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Create snapshot of volume %s"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Could not find key pair(s): %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr "Quota exceeded, too many key pairs."
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "Import key %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr "Not enough parameters, need group_name or group_id"
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "%s Not enough parameters to build a valid rule"
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Invalid IP protocol %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "No rule for the specified parameters."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr "%s - This rule already exists in group"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Create volume from snapshot %s"
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume of %s GB"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr "Delete Failed"
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr "Attach Failed."
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr "Detach Volume Failed."
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribute not supported: %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Allocate address"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr "No more floating IPs available"
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Release address %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr "Unable to release IP Address."
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Associate address %(public_ip)s to instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Unable to associate IP Address, no fixed_ips."
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr "multiple fixed_ips exist, using the first: %s"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr "Floating ip is already associated."
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr "l3driver call to add floating ip failed."
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr "Error, unable to associate floating ip."
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address %s"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr "Floating ip is not associated."
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr "Cannot disassociate auto assigned floating ip"
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Image must be available"
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Going to start terminating instances"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance %r"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "Going to stop instances"
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "Going to start instances"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image %s"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr "imageLocation is required"
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Registered image %(image_location)s with id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "user or group not specified"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "only group \"all\" is supported"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type must be add or remove"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Updating image %s publicity"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr "Not allowed to modify attributes for image %s"
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
@@ -1995,40 +2010,40 @@ msgstr ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "Couldn't stop instance with in %d sec"
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr "image of %(instance)s at %(now)s"
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Getting list of instances"
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance not present"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Getting list of instances"
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr "Invalid CIDR"
 
@@ -2204,89 +2219,107 @@ msgstr "Image metadata key too long"
 msgid "Invalid image metadata"
 msgstr "Invalid image metadata"
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 
 #: nova/api/openstack/common.py:366
+#, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "Instance is in an invalid state for '%(action)s'"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Rejecting snapshot request, snapshots currently disabled"
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Instance snapshots are not permitted at this time."
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Loaded extension: %s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr "Ext name: %s"
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Ext alias: %s"
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr "Ext description: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Ext namespace: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Ext updated: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "Exception loading extension: %s"
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Loading extension %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "Calling extension factory %s"
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Failed to load extension %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Failed to load extension %(classpath)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Failed to load extension %(ext_name)s: %(exc)s"
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr "cannot understand JSON"
@@ -2334,6 +2367,7 @@ msgstr "There is no such action: %s"
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr "Malformed request body"
 
@@ -2380,7 +2414,7 @@ msgstr "Template tree mismatch; adding slave %(slavetag)s to master %(mastertag)
 msgid "subclasses must implement construct()!"
 msgstr "subclasses must implement construct()!"
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr "Initializing extension manager."
 
@@ -2729,9 +2763,9 @@ msgstr "Resize requests require 'flavorRef' attribute."
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr "Invalid request body"
@@ -2793,6 +2827,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr "Server not found"
 
@@ -2960,7 +2995,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr "Only root certificate can be retrieved."
 
@@ -3003,34 +3039,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp not running..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Invalid snapshot"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, fuzzy, python-format
 msgid "Coverage doesn't have %s action"
 msgstr "Network does not have %s action"
@@ -3041,27 +3077,30 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s must be either 'MANUAL' or 'AUTO'."
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host and block_migration must be specified."
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Error in migrate %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "Fixed ip %(fixed_ip_id)s not found"
@@ -3110,7 +3149,7 @@ msgstr "Floating ip is not associated"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr "Missing parameter dict"
 
@@ -3359,30 +3398,36 @@ msgid "Create networks failed"
 msgstr "Create failed"
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr "Quota limit must be -1 or greater."
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3394,7 +3439,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr "Malformed scheduler_hints attribute"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Not enough parameters to build a valid rule."
 
@@ -3413,16 +3458,16 @@ msgstr "Showing network with id %s"
 msgid "security group default rule not found"
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Bad prefix for to_global_ipv6: %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "Security group not specified"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "Security group name cannot be empty"
 
@@ -3506,12 +3551,17 @@ msgstr "Loaded extension: %s"
 msgid "Ext version: %i"
 msgstr "Ext description: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Release address %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Release address %s"
@@ -3594,39 +3644,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Starting migration network for instance %(instance_uuid)s"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Starting migration network for instance %(instance_uuid)s"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3641,28 +3691,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Destroying VDIs for Instance %(instance_uuid)s"
@@ -3721,17 +3771,17 @@ msgstr "Launching VPN for %s"
 msgid "Failed to load %s"
 msgstr "Failed to create VM %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "element is not a child"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4105,16 +4155,16 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr "Cannot run any more instances of this type."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Can only run %s more instances of this type."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
@@ -4123,7 +4173,7 @@ msgstr ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -4132,93 +4182,93 @@ msgstr ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr "Metadata property key blank"
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr "Metadata property key greater than 255 characters"
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr "Metadata property value greater than 255 characters"
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Unable to attach boot volume to instance %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Going to run %s instances..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Instance type %(instance_type_id)s could not be found."
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Going to start terminating instances"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "host for instance is down, deleting from database"
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr "Going to try to soft delete instance"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr "Going to try to terminate instance"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr "Going to try to stop instance"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr "Going to try to start instance"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr "Searching by: %s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr "snapshot for %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id is None. Assuming migration."
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4227,63 +4277,63 @@ msgstr ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "%(overs)s quota exceeded for %(pid)s, tried to resize instance. %(msg)s"
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr "Locking"
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr "Unlocking"
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr "Volume must be attached in order to detach."
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Going to try to live migrate instance to %s"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr "Keypair name contains unsafe characters"
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Keypair name must be between 1 and 255 characters long"
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "Security group %s is not a string or unicode"
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Security group %s cannot be empty."
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4292,68 +4342,68 @@ msgstr ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "Security group %s should not be greater than 255 characters."
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr "Quota exceeded, too many security groups."
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Security group %s already exists"
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Unable to destroy vbd %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr "Security group is still in use"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr "Failed to update usages deallocating security group"
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Rule (%s) not found"
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr "Quota exceeded, too many security group rules."
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress %s"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr "Security group id should be integer"
 
@@ -4421,14 +4471,14 @@ msgid "names can only contain [a-zA-Z0-9_.- ]"
 msgstr "names can only contain [a-zA-Z0-9_.- ]"
 
 #: nova/compute/flavors.py:101
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than 0"
-msgstr "Volume size '%s' must be an integer and greater than 0"
+#, python-format
+msgid "'%s' argument must be a positive integer"
+msgstr ""
 
 #: nova/compute/flavors.py:110
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than or equal to 0"
-msgstr "Volume size '%s' must be an integer and greater than 0"
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
 
 #: nova/compute/flavors.py:119
 #, fuzzy
@@ -4453,253 +4503,253 @@ msgstr "Instance type %s not found for deletion"
 msgid "Possibly task preempted."
 msgstr "Possibly task preempted."
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr "Instance has been destroyed from under us while trying to set it to ERROR"
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Failed to terminate instance"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Current state is %(drv_state)s, state in DB is %(db_state)s."
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr "Rebooting instance after nova-compute restart."
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Hypervisor driver does not support resume guests"
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Failed to suspend instance"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Hypervisor driver does not support firewall rules"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Unexpected status code"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr "Checking state"
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "Setting up bdm %s"
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr "Retry info not present, will not reschedule"
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr "No request spec, will not reschedule"
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, fuzzy, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr "Re-scheduling instance: attempt %d"
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr "Instance build timed out. Set to error state."
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr "Starting instance..."
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Floating ip pool not found."
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr "Instance failed network setup"
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Instance network_info: |%s|"
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr "Instance failed block device setup"
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr "Instance failed to spawn"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr "Deallocating network for instance"
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Failed to dealloc network for deleted instance"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s instance"
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Ignoring DiskNotFound: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Ignoring VolumeNotFound: %s"
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr "terminating bdm %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr "Ignoring volume cleanup failure due to %s"
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. Setting instance vm_state to ERROR"
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr "Rebuilding instance"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s is not on shared storage: %(reason)s"
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Attach boot from volume failed: %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr "Rebooting instance"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4708,25 +4758,25 @@ msgstr ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: rebooted"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr "instance snapshotting"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4735,161 +4785,161 @@ msgstr ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "Found %(num_images)d images (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "Rotating out %d backups"
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr "Deleting image %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, 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:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr "Root password set"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 #, 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:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password failed: %s"
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr "error setting admin password"
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr "Rescuing"
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Error trying to reschedule"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "DB error: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr "Unrescuing"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Setting instance to %(state)s state."
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instance has no volume."
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr "destination same as source!"
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr "Migrating"
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr "Pausing"
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr "Unpausing"
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr "Retrieving diagnostics"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr "Resuming"
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr "Reset network"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr "Inject network info"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "network_info to inject: |%s|"
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr "Get console output"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Getting vnc console"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, 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:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "Attaching volume %(volume_id)s to %(mountpoint)s"
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
@@ -4898,59 +4948,59 @@ msgstr ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, 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:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr "Detaching volume from unknown instance"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "allocate_for_instance() for %s"
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr "_post_live_migration() is started.."
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4958,20 +5008,20 @@ 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr "Post operation of migration started"
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Failed to get info for disk %s"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr "Updated the info_cache for instance"
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4980,12 +5030,12 @@ msgstr ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, 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:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
@@ -4994,26 +5044,26 @@ msgstr ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr "In ERROR state"
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, 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:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, python-format
 msgid ""
 "Running instance usage audit for host %(host)s from %(begin_time)s to "
@@ -5022,25 +5072,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:3769
+#: nova/compute/manager.py:3784
 #, 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:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Updating bandwidth usage cache"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr "Updating host status"
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5049,11 +5099,11 @@ msgstr ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 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:3980
+#: nova/compute/manager.py:3995
 #, python-format
 msgid ""
 "During the sync_power process the instance has moved from host %(src)s to"
@@ -5062,76 +5112,76 @@ msgstr ""
 "During the sync_power process the instance has moved from host %(src)s to"
 " host %(dst)s"
 
-#: nova/compute/manager.py:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr "Instance shutdown by itself. Calling the stop API."
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr "error during stop() in sync_power_state."
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 #, 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:4049
+#: nova/compute/manager.py:4064
 #, fuzzy
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr "Instance is paused or suspended unexpectedly. Calling the stop API."
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr "Instance is not stopped. Calling the stop API."
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr "Instance is not (soft-)deleted."
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, skipping..."
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr "Reclaiming deleted instance"
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Loading compute driver '%s'"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr "No service record for host %s"
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Setting instance to %(state)s state."
@@ -5261,16 +5311,37 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "Adding console"
@@ -5352,7 +5423,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Failed to reboot instance"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5412,7 +5483,7 @@ msgstr "instance %s: rescued"
 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"
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -6056,78 +6127,78 @@ msgstr "validate_networks() for %s"
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Multiple floating IP pools matches found for name '%s'"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Security group id should be integer"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Caught error: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Security group with rule %(rule_id)s not found."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr "Security group %(security_group_id)s not found for project %(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6156,7 +6227,7 @@ msgstr "Invalid server_string: %s"
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6428,11 +6499,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr "Could not send notification to %(topic)s. Payload=%(message)s"
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr "Failed to load plugin %(plug)s: %(exc)s"
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6868,72 +6934,63 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr "No key defining hosts for topic '%s', see ringfile"
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "Is the appropriate service running?"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "Could not find another compute"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr "Exception during scheduler.run_instance"
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr "Driver must implement schedule_prep_resize"
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr "Driver must implement schedule_run_instance"
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 #, fuzzy
 msgid "Driver must implement select_hosts"
 msgstr "Driver must implement schedule_run_instance"
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "Attempting to build %(num_instances)d instance(s)"
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "Request: %s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Destroying VDIs for Instance %(instance_uuid)s"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr "Invalid value for 'scheduler_max_attempts', must be >= 1"
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
@@ -6942,17 +6999,17 @@ msgstr ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Filtered %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "Filtered %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6989,23 +7046,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr "Received %(service_name)s service update from %(host)s."
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, fuzzy, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr "Received %(service_name)s service update from %(host)s."
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "No service for compute ID %s"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Failed to schedule_%(method)s: %(ex)s"
@@ -7015,10 +7072,10 @@ msgstr "Failed to schedule_%(method)s: %(ex)s"
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr "Could not stat scheduler options file %(filename)s: '%(e)s'"
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
@@ -7041,7 +7098,7 @@ msgstr "%(host_state)s fails instance_type extra_specs requirements"
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7335,43 +7392,45 @@ 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:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "Running instances: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "After terminating instances: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr "Internal error"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "After force-killing instances: %s"
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 #, fuzzy
 msgid "spawn error"
 msgstr "unknown guestmount error"
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7507,12 +7566,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Creating files in %s to simulate guest agent"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Removing simulated guest agent files in %s"
@@ -7522,25 +7581,25 @@ msgstr "Removing simulated guest agent files in %s"
 msgid "Added %(filepath)s to config drive"
 msgstr "Added %(filepath)s to config drive"
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr "Compute driver option required, but not specified"
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr "Loading compute driver '%s'"
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Unable to load the virtualization driver: %s"
@@ -7550,7 +7609,7 @@ msgstr "Unable to load the virtualization driver: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "Attempted to unfilter instance which is not filtered"
 
@@ -7604,37 +7663,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "get_info called for instance"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7688,85 +7747,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "floating IP allocation for instance |%s|"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Fetching image '%s' from glance"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Injecting %(injection)s into image %(img_id)s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "empty project id for instance %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "empty project id for instance %s"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, fuzzy, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr "Timeout while waiting on RPC response."
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "empty project id for instance %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Get console output for instance %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr "Node is unknown error state."
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Unable to find host for Instance %s"
@@ -7866,12 +7925,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, fuzzy, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr "Could not determine iscsi initiator name"
@@ -7881,7 +7940,7 @@ msgstr "Could not determine iscsi initiator name"
 msgid "No fixed PXE IP is associated to %s"
 msgstr "No fixed ips associated to instance"
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7895,23 +7954,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "No more floating ips available."
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "partition %s not found"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Virtual Interface creation failed"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "partition %s not found"
@@ -8026,12 +8080,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8288,12 +8342,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "injected file path not valid"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Failed to update agent: %(resp)r"
@@ -8322,24 +8376,24 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr "The ISCSI initiator name can't be found. Choosing the default one"
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr "plug_vifs called"
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 #, fuzzy
 msgid "unplug_vifs called"
 msgstr "plug_vifs called"
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr "ensure_filtering_rules_for_instance called"
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr "unfilter_instance called"
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr "get_console_output called"
 
@@ -8352,7 +8406,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:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "Updating host stats"
@@ -8719,12 +8773,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Using config drive"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Creating config drive at %(path)s"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Creating config drive at %(path)s"
@@ -8883,7 +8937,7 @@ msgstr "Detach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creating snapshot for instance %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr "Could not determine iscsi initiator name"
 
@@ -8922,216 +8976,216 @@ msgstr "Unable to find vbd for vdi %s"
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "Volume %s does not exist in Nexenta SA"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Connection to libvirt broke"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr "Can not handle authentication request for %d credentials"
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connecting to libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr "During wait destroy, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr "Instance destroyed successfully."
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Going to stop instances"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr "Error from libvirt during undefineFlags. Retrying with undefine"
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
-msgstr "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Failed to cleanup directory %(target)s: %(e)s"
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "Could not determine iscsi initiator name"
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "Could not determine iscsi initiator name"
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr "During detach_volume, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "No networks defined."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "During detach_volume, instance disappeared."
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "No networks defined."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr "Instance soft rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr "Failed to soft reboot instance."
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr "Instance shutdown successfully."
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr "Instance rebooted successfully."
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr "Instance is running"
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "Instance spawned successfully."
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr "Guest does not have a console available"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr "Path '%(path)s' supports direct I/O"
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr "Creating image"
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr "Using config drive"
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Injecting %(injection)s into image %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "Ignoring error injecting data into image %(img_id)s (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
@@ -9140,20 +9194,20 @@ msgstr ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr "Config requested a custom CPU model, but no model name was provided"
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr "A CPU model name should not be set when a host CPU model is requested"
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr "CPU mode '%(mode)s' model '%(model)s' was chosen"
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
@@ -9161,7 +9215,7 @@ msgstr ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9169,19 +9223,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9190,33 +9244,33 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, fuzzy, python-format
 msgid "Invalid exclusion expression %r"
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, fuzzy, python-format
 msgid "Invalid inclusion expression %r"
 msgstr "Invalid reservation expiration %(expire)s."
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9225,25 +9279,25 @@ msgstr ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. This error can be safely ignored for now."
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt version is too old (does not support getVersion)"
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Getting image size for the image %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9251,21 +9305,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9274,15 +9328,15 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr "Block migration can not be used with shared storage."
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr "Live migration can not be used without shared storage."
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9291,7 +9345,7 @@ msgstr ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9300,7 +9354,7 @@ msgstr ""
 "Instance launched has CPU info:\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9315,7 +9369,7 @@ msgstr ""
 "\n"
 "Refer to %(u)s"
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9324,22 +9378,22 @@ msgstr ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr "The firewall filter for %s does not exist"
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() failed %(cnt)d.Retry up to %(max_retry)d for %(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9348,41 +9402,41 @@ msgstr ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
-msgstr "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, 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:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr "Starting migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr "Instance running successfully."
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr "Starting finish_migration"
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr "Starting finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3915
-#, fuzzy, python-format
-msgid "Checking instance files accessability%(instance_path)s"
-msgstr "Deleting instance files %(target)s"
+#: nova/virt/libvirt/driver.py:3942
+#, python-format
+msgid "Checking instance files accessability %s"
+msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
 msgid ""
@@ -9402,15 +9456,15 @@ msgstr "Ensuring static filters"
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
+msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables firewall: Setup Basic Filtering"
 
@@ -9612,47 +9666,47 @@ msgstr "Path %s must be LVM logical volume"
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr "Can't retrieve root device path from instance libvirt configuration"
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Unexpected error: %s"
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "Ensuring bridge %s"
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr "Failed while unplugging vif"
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9660,7 +9714,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9668,7 +9722,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9676,7 +9730,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9896,7 +9950,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -10049,32 +10103,32 @@ msgstr ""
 "Must specify vmwareapi_host_ip,vmwareapi_host_username and "
 "vmwareapi_host_password to usecompute_driver=vmwareapi.VMWareESXDriver"
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "marker [%s] not found"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "In vmwareapi:_create_session, got this exception: %s"
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "In vmwareapi:_call_method, got this exception: %s"
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "Task [%(task_name)s] %(task_ref)s status: success"
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "In vmwareapi:_poll_task, Got this error %s"
@@ -10089,34 +10143,34 @@ msgstr "Error(s) %s occurred in the call to RetrieveProperties"
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "Property %(attr)s not set for the managed object %(name)s"
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr "There is no VM registered"
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "Virtual Machine with ref %s is not there"
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "Logging out a session that is invalid or already logged out: %s"
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr "Session is faulty"
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "Session Invalid"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " No Virtual Machine has been registered yet"
@@ -10349,12 +10403,12 @@ msgstr "Doing hard reboot of VM"
 msgid "Did hard reboot of VM"
 msgstr "Did hard reboot of VM"
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Destroying VM"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "VM destroyed"
@@ -10472,36 +10526,36 @@ msgstr "Powering off the VM"
 msgid "Powered on the VM"
 msgstr "Powered off the VM"
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Updating progress to %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Creating volume: %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr "instance not present"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
@@ -10510,66 +10564,66 @@ msgstr ""
 "In vmwareapi:vmops:destroy, got this exception while un-registering the "
 "VM: %s"
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Creating volume: %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Create volume from snapshot %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, 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"
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "Automatically hard rebooting"
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics not implemented for vmwareapi"
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 #, fuzzy
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr "Reconfiguring VM instance to attach the image disk"
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 #, fuzzy
 msgid "Reconfigured VM instance to set the machine id"
 msgstr "Reconfigured VM instance to attach the image disk"
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, fuzzy, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr "Reconfiguring VM instance to set the machine id with ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, fuzzy, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr "Reconfigured VM instance to set the machine id with ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Creating directory with path %s"
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Created directory with path %s"
@@ -10692,12 +10746,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:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, 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:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10706,74 +10760,55 @@ msgstr ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
 "args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, 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"
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr "Querying agent version"
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr "Reached maximum time attempting to query agent version"
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr "Updating agent to %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "Setting admin password"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr "Injecting file path: %r"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr "Resetting network"
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
@@ -10781,7 +10816,7 @@ msgstr ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
@@ -10789,15 +10824,15 @@ msgstr ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr "XenServer tools are not installed in this image"
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL error: %s"
@@ -10816,54 +10851,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr "Failure while cleaning up attached VDIs"
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr "Could not determine key: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr "Host startup on XenServer is not supported."
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "Unable to log in to XenAPI (is the Dom0 disk full?)"
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr "Host is member of a pool, but DB says otherwise"
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Got exception: %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "Raising NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake does not have an implementation for %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Calling getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr "Calling setter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11790,9 +11825,3 @@ msgstr "status must be available"
 msgid "status must be 'available'"
 msgstr "status must be available"
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr "Certificate %(certificate_id)s not found."
-
-#~ msgid "quantum authentication failed"
-#~ msgstr "Authentication error"
-
diff --git a/nova/locale/es/LC_MESSAGES/nova.po b/nova/locale/es/LC_MESSAGES/nova.po
index bc710cb4a..9eece07f5 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -84,305 +84,305 @@ msgstr "Fallo a reinicia la instancia"
 msgid "Flags path: %s"
 msgstr "Ruta a las opciones: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Una excepcion desconocida ha ocurrido"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Fallo al desencriptar el texto"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Fallo al desencriptar el texto"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Creacion de interfaz virtual fallida"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "Fallaron los 5 intentos de crear una interfaz virtual con una dirección "
 "mac única"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "No Autorizado"
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "La política no permite que la %(action)s se realice"
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "La imagen %(image_id)s es inaceptable: %(reason)s"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "no hay método para el mensaje: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Parametros inaceptables"
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Volumen %(volume_id)s no está conectado con nada"
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "La petición es inválida."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Entrada invalida recibida"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Volumen inválido"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Firma invalida para el usuario %s"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Rango de puertos invalido %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP invalido %(protocol)s"
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Tipo de contenido invalido %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Cidr %(cidr)s invalido"
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "La instacia %(instance_id)s no se esta ejecutando"
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Fallo al suspender la instancia"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "El servicio no esta disponible en este momento"
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "El servicio de computo no esta disponible en este momento"
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
 "(%(host)s)"
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Informacion del CPU inaceptable"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s no es una direccion IP v4/6 valida"
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -390,86 +390,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato de disco %(disk_format)s no es aceptable"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "La imagen %(image_id)s es inaceptable: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Cidr %(cidr)s invalido"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instancia %s: rescatada"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -477,899 +477,914 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 "El punto de montaje %(mountpoint)s esta unido a la instancia "
 "%(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "configurando la red del host"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Tipo de contenido invalido %(content_type)s."
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "el grupo de volumenes %s no existe"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "No se puede unir la imagen con el loopback: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "No se puede unir la imagen con el loopback: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "La instancia %(instance_id)s no esta en modo de rescate"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "el grupo %s ya existe"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1384,15 +1399,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Fallo al generar metadatos para la ip %s"
@@ -1415,17 +1430,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1727,265 +1742,265 @@ msgstr "Ha sucedido un error desconocido. Por favor repite el intento de nuevo."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Creando par de claves %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Borrar para de claves %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Protocolo IP invalido %(protocol)s"
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "No hay regla para los parámetros especificados."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regla ya existe en el grupo %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Crear volumen de %s GB"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Desasociar volumen %s"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo no soportado: %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Asignar dirección"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar dirección %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desasociar dirección %s"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instancia %r"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "usuario o grupo no especificado"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "sólo el grupo \"all\" está soportado"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type debe ser añadir o eliminar"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Actualizando imagen %s públicamente"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instancia %s: rescatada"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Cidr %(cidr)s invalido"
@@ -2157,89 +2172,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2287,6 +2320,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2333,7 +2367,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2682,9 +2716,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2746,6 +2780,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2909,7 +2944,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2951,33 +2987,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Captura no valida"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2988,26 +3024,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "configurando la red del host"
@@ -3056,7 +3095,7 @@ msgstr "el grupo %s ya existe"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3300,30 +3339,36 @@ msgid "Create networks failed"
 msgstr "configurando la red del host"
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3335,7 +3380,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3353,16 +3398,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3447,12 +3492,17 @@ msgstr "Obtenida excepción %s"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Liberar dirección %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Liberar dirección %s"
@@ -3535,39 +3585,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3582,28 +3632,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
@@ -3662,17 +3712,17 @@ msgstr "Lanzando VPN para %s"
 msgid "Failed to load %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4038,257 +4088,257 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
 "este tipo."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Quota de instancias superada. Sólo puedes ejecutar %s instancias más de "
 "este tipo."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Imposible adjuntar volumen a la instancia %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Comenzando snapshot para la VM %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Crear Grupo de Seguridad %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Imposible destruir VBD %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4353,12 +4403,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4383,16 +4433,16 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4401,655 +4451,655 @@ msgstr ""
 "Incapaz de emigrar la instancia %(instance_id)s al actual anfitrion "
 "(%(host)s)"
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Sucedió un error inexperado: %s"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desasociar volumen %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando instancia %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instancia %s: reiniciada"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Fallo al suspender la instancia"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instancia %s: creando snapshot"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instancia %s: obteniendo los diagnosticos"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 #, fuzzy
 msgid "Inject network info"
 msgstr "configurando la red del host"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desvinculando volumen de instancia desconocida %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instancia %s: arrancada"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Borrando usuario %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
@@ -5169,15 +5219,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5259,7 +5328,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5319,7 +5388,7 @@ msgstr "instancia %s: rescatada"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5937,78 +6006,78 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "configurando la red del host"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Capturado error: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revocar ingreso al grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Borrar grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Capturado error: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Autorizar ingreso al grupo de seguridad %s"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6034,7 +6103,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6302,11 +6371,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6738,86 +6802,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Tipo de instancia inválido %(instance_type)s."
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6854,23 +6911,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6880,9 +6937,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6906,7 +6963,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7183,42 +7240,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "Ejecutando instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Después de terminar las instancias: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7346,12 +7405,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7361,25 +7420,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7388,7 +7447,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7443,37 +7502,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7526,85 +7585,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Obtener salida de la consola para la instancia %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Tipo de instancia inválido %(instance_type)s."
@@ -7701,12 +7760,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7716,7 +7775,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7730,22 +7789,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "instancia %s: arrancada"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Creacion de interfaz virtual fallida"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7858,12 +7913,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8118,12 +8173,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Fallo al montar el sistema de ficheros: %s"
@@ -8152,23 +8207,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Obtener salida de la consola para la instancia %s"
@@ -8182,7 +8237,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8538,12 +8593,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Se va a iniciar la finalización de las instancias"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8709,7 +8764,7 @@ msgstr "Volume_separado: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Creando una instancia raw"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8748,240 +8803,240 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "el grupo de volumenes %s no existe"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Conexión a libvirt rota"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Conectando a libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Vamos a ejecutar %s insntacias..."
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instancia %s: reiniciada"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Fallo a reinicia la instancia"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "El usuario no tiene privilegios de administrador"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Pidiendo xapi a subir %(vdi_uuids)s como ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8989,76 +9044,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Fallo al generar metadatos para la ip %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9066,50 +9121,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9119,69 +9174,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Fallo de autenticación: %s"
+#: nova/virt/libvirt/driver.py:3332
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9200,15 +9255,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9399,47 +9454,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9447,7 +9502,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9455,7 +9510,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9463,7 +9518,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9677,7 +9732,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9824,32 +9879,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9864,34 +9919,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10105,12 +10160,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Des-registrando la imagen %s"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10217,101 +10272,101 @@ msgstr "Vamos a ejecutar %s insntacias..."
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "La instacia %(instance_id)s no esta suspendida"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Borrando usuario %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instancia %s: rescatada"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Borrando usuario %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Imposible encontrar volumen %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10438,106 +10493,87 @@ msgstr ""
 "El punto de montaje %(mountpoint)s se desligó de la instancia "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Llanado al adquiridor %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10556,54 +10592,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Obtenida excepción %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "Lanzando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake no tiene una implementación para %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Llanado al adquiridor %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11502,9 +11538,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/fi_FI/LC_MESSAGES/nova.po b/nova/locale/fi_FI/LC_MESSAGES/nova.po
index 63e3344ec..825b13e15 100644
--- a/nova/locale/fi_FI/LC_MESSAGES/nova.po
+++ b/nova/locale/fi_FI/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-18 19:07+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Finnish (Finland) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/fr/LC_MESSAGES/nova.po b/nova/locale/fr/LC_MESSAGES/nova.po
index f07b460ef..0a5c536f9 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -82,163 +82,163 @@ msgstr "Échec du redémarrage de l'instance"
 msgid "Flags path: %s"
 msgstr "Chemin des propriétés: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Une exception inconnue s'est produite."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Échec du décryptage du text"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Échec du décryptage du text"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "La création de l'Interface Virtuelle a échoué"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "Les 5 tentatives de création de l'interface virtuelle avec une adresse "
 "MAC unique ont échoué"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Non autorisé."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Le réglage des droits n'autorise pas %(action)s à être effectué(e)(s)"
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "L'image %(image_id)s n'a pas été trouvée."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Paramètres inacceptables."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Le volume %(volume_id)s n'est lié à rien"
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "La paire de clés de donnée n'est pas valide"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "La requête est invalide."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Entrée invalide reçue"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Volume invalide"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Signature non valide pour l'utilisateur %s"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "La plage de port %(from_port)s:%(to_port)s. %(msg)s est invalide"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Le protocole IP %(protocol)s est invalide"
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Le type de contenu %(content_type)s est invalide"
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Le cidr %(cidr)s est invalide"
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -247,16 +247,16 @@ msgstr ""
 "Impossible d'effectuer l'action '%(action)s' sur l'ensemble "
 "%(aggregate_id)s. Raison: %(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -265,90 +265,90 @@ msgstr ""
 "L'instance %(instance_uuid)s dans %(attr)s %(state)s. Impossible de "
 "%(method)s pendant que l'instance est dans cet état."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "L'instance %(instance_id)s  ne fonctionne pas."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "L'instance %(instance_id)s  n'est pas suspendue"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Le service est indisponible actuellement."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Le service de calcul est indisponible actuellement."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 "Impossible de migrer l'instance (%(instance_id)s) vers l'hôte actuel "
 "(%(host)s)."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Le type de l'hyperviseur fourni n'est pas valide."
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 "L'instance nécessite une version plus récente de l'hyperviseur que celle "
 "fournie."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -357,31 +357,31 @@ msgstr ""
 "Le chemin d'accès du disque (%(path)s)  existe déjà, il n'était pas prévu"
 " d'exister."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Le chemin de périphérique (%(path)s) est invalide."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "Le chemin de périphérique (%(path)s) est invalide."
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "Le chemin de périphérique (%(path)s) est invalide."
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Info CPU inacceptable"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s n'est pas une adresse IP v4/6 valide"
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -391,7 +391,7 @@ msgstr ""
 " VLAN prévu est %(tag)s, mais celui qui est associé avec le groupe de "
 "port est %(pgroup)s."
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -402,86 +402,86 @@ msgstr ""
 "l'adaptateur physique souhaité. VSwitch est %(expected)s, mais la "
 "principale association est %(actual)s."
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Le format de disque %(disk_format)s n'est pas acceptable"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "L'image %(image_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "L'instance %(instance_id)s est inacceptable: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s est inaccepatble."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Le cidr %(cidr)s est invalide"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "instance %s: récupérée"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "La ressource n'a pas pu être trouvée."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "Pas d'adresse IP fixe associée avec l'id %(id)s."
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Le volume %(volume_id)s n'a pas pu être trouvé."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "Aucun id destination trouvé pour le volume %(volume_id)s."
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "Aucun disque sur %(location)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "Impossible de trouver un gestionnaire pour le %(driver_type)s de volume."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "L'image href %(image_href)s est invalide."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "L'image %(image_id)s n'a pas été trouvée."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -489,65 +489,65 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Le projet %(project_id)s n'a pas été trouvé."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "Impossible de trouver le SR pour lire/écrire le VDI."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s est requis pour créer un réseau."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Aucun réseau trouvé pour le pont %(bridge)s"
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Aucun réseau trouvé pour l'uuid %(uuid)s"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Aucun réseau trouvé avec le cidr %(cidr)s."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Aucun réseau trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Aucun réseau défini."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -556,53 +556,53 @@ msgstr ""
 "L'uuid réseau %(network_uuid)s n'est pas présent ou n'a pas été affecté "
 "au projet %(project_id)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Le réseau %(network_id)s n'a pas été trouvé."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Aucun réseau trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "Aucun réseau trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "Pas d'adresse IP fixe associée avec l'id %(id)s."
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "Pas d'IP fixe trouvée pour l'adresse %(address)s."
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "L'instance %(instance_id)s n'a aucunes IPs fixes"
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 "Le réseau hôte %(host)s n'a aucunes IPs fixes dans le réseau "
 "%(network_id)s."
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "L'instance %(instance_id)s ne peut avoir l'IP fixe '%(ip)s'."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
@@ -611,182 +611,182 @@ msgstr ""
 "L'adresse IP fixe (%(address)s) n'existe pas dans le réseau "
 "(%(network_uuid)s)."
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "L'adresse IP fixe %(address)s est déjà utilisée."
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "L'adresse IP fixe %(address)s est invalide."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "Aucunes IPs fixes disponibles."
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "Aucunes IPs fixes trouvées."
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "L'entrée DNS %(name)s existe déjà dans le domaine %(domain)s."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "Aucune IP dynamique trouvée pour l'adresse %(address)s."
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "Aucune IP dynamique trouvée pour l'hôte %(host)s."
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "Aucune IP dynamique trouvée pour l'adresse %(address)s."
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "L'interface %(interface)s non trouvée."
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "La paire de clés %(name)s est introuvable pour l'utilisateur %(user_id)s"
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Le service %(service_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "L'hôte %(host)s ne peut pas être trouvé."
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "L'hôte de calcul %(host)s ne peut pas être trouvé."
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "Impossible de trouver le binaire %(binary)s sur l'hôte %(host)s."
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Le quota ne peut pas être trouvé"
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "La clé d'accès %(access_key)s ne peut pas être trouvée."
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "L'utilisateur %(user_id)s n'a pas été trouvé."
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Groupe de sécurité %(security_group_id)s non trouvé."
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Groupe de sécurité %(security_group_id)s non trouvé pour le projet "
 "%(project_id)s."
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -795,7 +795,7 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s est déjà associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -804,143 +804,143 @@ msgstr ""
 "Le groupe de sécurité %(security_group_id)s n'est pas associé avec "
 "l'instance %(instance_id)s"
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "La migration %(migration_id)s ne peut être trouvée."
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 "Migration non trouvée pour l'instance %(instance_id)s avec le statut "
 "%(status)s."
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "La console %(console_id)s ne peut être trouvée."
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "La console pour l'instance %(instance_id)s ne peut être trouvée."
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "La console pour l'instance %(instance_id)s ne peut être trouvée."
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Le type de console %(console_type)s est invalide "
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Le type d'instance %(instance_type_id)s ne peut être trouvé."
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Le type d'instance avec le nom %(instance_type_name)s ne peut être trouvé."
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "Le Flavor %(flavor_id)s ne peut être trouvé."
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "Le groupe de volume %s n'existe pas"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "La plannification de filtre hôte %(filter_name)s ne peut être trouvée."
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
@@ -949,335 +949,335 @@ msgstr ""
 "Le volume %(volume_id)s n'a pas de métadonnée avec la clé "
 "%(metadata_key)s."
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Le type d'instance avec le nom %(instance_type_name)s ne peut être trouvé."
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Aucunes IPs dynamiques existes."
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "La console pour l'instance %(instance_id)s ne peut être trouvée."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Le volume %(volume_id)s n'a pas pu être trouvé."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Le snapshot %(snapshot_id)s n'a pas été trouvé."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "L'image %(image_id)s n'a pas été trouvée."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Aucun noyau trouvé pour l'image %(image_id)s."
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "Aucune IP dynamique trouvée pour l'hôte %(host)s."
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
@@ -1286,122 +1286,137 @@ msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "La paire de clés %(name)s est introuvable pour l'utilisateur %(user_id)s"
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Le quota pour le projet %(project_id)s ne peut pas être trouvé."
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Le projet %(project_id)s n'a pas été trouvé."
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "L'instance %(instance_id)s  n'est pas en mode secours"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Le type d'instance avec le nom %(instance_type_name)s ne peut être trouvé."
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1416,15 +1431,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
@@ -1447,17 +1462,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1766,273 +1781,273 @@ msgstr ""
 "Requête API non supportée : controleur = %(controller)s, action = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Création du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Suppression du bi-clef %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "Pas assez de parametres pour contruire un règle valide."
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Le protocole IP %(protocol)s est invalide"
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Pas de règle pour les paramètres spécifiés."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Cette règle existe déjà dans le groupe %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Création d'un volume de %s Go"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 "Montage du volume %(volume_id)s sur l'instance %(instance_id)s en tant "
 "que %(device)s"
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Dé-montage du volume %s"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "attribut non reconnu : %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Allocation d'adresse"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "Association de l'adresse %(public_ip)s avec l'instance %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "L'IP dynamique %(address)s est associée."
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "Aucune IPs dynamiques disponibles."
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Désassociation de l'adresse %s"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "L'IP dynamique %(address)s n'est pas associée."
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Début de la destruction d'instance"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Re-démarrage de l'instance %r"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Dé-enregitrement de l'image %s"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Image %(image_location)s enregistré avec l'id %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "Utilisateur ou groupe non spécifié"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "Seul le group \"tous\" est supporté"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 "le type d'opération (operation_type) doit être ajout (add) ou suppression"
 " (remove)"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Mis à jour de la publication de l'image %s"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "instance %s: récupérée"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "Le cidr %(cidr)s est invalide"
@@ -2204,89 +2219,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2334,6 +2367,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2380,7 +2414,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2729,9 +2763,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2793,6 +2827,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2956,7 +2991,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2998,34 +3034,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp non actif..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Snapshot invalide"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -3036,26 +3072,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "Le certificat %(certificate_id)s non trouvé."
@@ -3104,7 +3143,7 @@ msgstr "L'IP dynamique %(address)s n'est pas associée."
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3350,30 +3389,36 @@ msgid "Create networks failed"
 msgstr "Aucun réseau défini."
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3385,7 +3430,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Pas assez de parametres pour contruire un règle valide."
 
@@ -3404,16 +3449,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3498,12 +3543,17 @@ msgstr "Reçu exception : %s"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Désallocation de l'adresse %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Désallocation de l'adresse %s"
@@ -3586,39 +3636,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3633,28 +3683,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
@@ -3713,17 +3763,17 @@ msgstr "Démarrage du VPN pour %s"
 msgid "Failed to load %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4091,257 +4141,257 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
 " type de plus."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 "Quota d'instances dépassé. Vous ne pouvez éxécuter que %s instances de ce"
 " type de plus."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossible d'attacher le volume à l'instance %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Démarrage de %s instances..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Le type d'instance %(instance_type_id)s ne peut être trouvé."
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Début de la destruction d'instance"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Début de création d'instantané (snapshot) pour la VM %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Création du groupe de sécurité %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossible de supprimer le VBD %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorisation du groupe de sécurité %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4406,12 +4456,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4436,16 +4486,16 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
@@ -4454,658 +4504,658 @@ msgstr ""
 "Impossible de migrer l'instance (%(instance_id)s) vers l'hôte actuel "
 "(%(host)s)."
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "\"Erreur inopinée\" remontée : %s"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Dé-montage du volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Redémarrage de l'instance %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "instance %s: re-démarrée"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Échec de la suspension de l'instance"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instance %s: dé-récupération"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "instance %s: création d'un instantané (snapshot)"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instance %s: récupération des diagnostiques"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 #, fuzzy
 msgid "Inject network info"
 msgstr "réglage de l'hôte réseau"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Ajout de console"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Démontage de volume d'une instance inconnue %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "instance %s: a démarrée"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
@@ -5226,15 +5276,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "Ajout de console"
@@ -5316,7 +5385,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5376,7 +5445,7 @@ msgstr "instance %s: récupérée"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5996,80 +6065,80 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Aucune IP dynamique trouvée pour l'id %(id)s."
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Erreur interceptée : %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Révocation de groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Suppression du groupe de sécurité %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Erreur interceptée : %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Le groupe de sécurité avec la règle %(rule_id)s non trouvé."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Groupe de sécurité %(security_group_id)s non trouvé pour le projet "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6097,7 +6166,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6365,11 +6434,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6801,86 +6865,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "L'instance de type %(instance_type)s est invalide."
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Volume non trouvé pour l'instance %(instance_id)s."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6917,23 +6974,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6943,9 +7000,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6969,7 +7026,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7246,42 +7303,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "Instance actives : %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Après l'arrêt d'instances : %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7409,12 +7468,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7424,25 +7483,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7451,7 +7510,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7506,37 +7565,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7589,85 +7648,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Début de la destruction d'instance"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Début de la destruction d'instance"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Récupération de la sortie de la console de l'instance %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "L'instance de type %(instance_type)s est invalide."
@@ -7764,12 +7823,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7779,7 +7838,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr "Pas d'adresse IP fixe associée avec l'id %(id)s."
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7793,23 +7852,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "Aucunes IPs fixes disponibles."
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "Aucuns types d'instance trouvés."
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "La création de l'Interface Virtuelle a échoué"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7926,12 +7980,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8186,12 +8240,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Impossible de monter le système de fichier : %s"
@@ -8220,23 +8274,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Récupération de la sortie de la console de l'instance %s"
@@ -8250,7 +8304,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8606,12 +8660,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Début de la destruction d'instance"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "Injection du chemin d'accès : '%s'"
@@ -8777,7 +8831,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Création d'une instance raw"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8816,244 +8870,244 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "Le groupe de volume %s n'existe pas"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "Connexion à libvirt interrompue"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Connexion à libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Va essayer d'arrêter %s"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Aucun réseau défini."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Aucun réseau défini."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "instance %s: re-démarrée"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Échec du redémarrage de l'instance"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data: %(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L’utilisateur n'a pas les privilèges administrateur"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Demande de chargement à xapi de %(vdi_uuids)s en tant qu'ID %(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 "instance %(inst_name)s : l'erreur d'injection de donné dans l'image "
 "%(img_id)s (%(e)s) a été ignorée"
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9061,76 +9115,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Impossible de récupérer les méta-donnérs pour l'IP : %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9138,50 +9192,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9191,69 +9245,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Echec d'authentification : %s"
+#: nova/virt/libvirt/driver.py:3332
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9272,15 +9326,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9471,47 +9525,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9519,7 +9573,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9527,7 +9581,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9535,7 +9589,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9749,7 +9803,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9896,32 +9950,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9936,34 +9990,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10177,12 +10231,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Re-démarrage xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "Nested renvoi %s"
@@ -10290,101 +10344,101 @@ msgstr "Démarrage de %s instances..."
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "L'instance %(instance_id)s n'a pas pu être trouvée."
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "instance %s: récupérée"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Suppression de l'utilisateur %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Impossible de trouver le volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10511,106 +10565,87 @@ msgstr ""
 "Le point de montage %(mountpoint)s à été détaché de l'instance "
 "%(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Appel du getter %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "Injection du chemin d'accès : '%s'"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erreur OpenSSL : %s"
@@ -10630,54 +10665,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Impossible de déchiffrer la clef privée : %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "Reçu exception : %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "Fonction non implémentée"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake n'a pas d'implémentation pour %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Appel du getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11582,9 +11617,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr "Le certificat %(certificate_id)s non trouvé."
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/hr/LC_MESSAGES/nova.po b/nova/locale/hr/LC_MESSAGES/nova.po
index 9bbfae0f3..ec138bb0d 100644
--- a/nova/locale/hr/LC_MESSAGES/nova.po
+++ b/nova/locale/hr/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -81,298 +81,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -380,85 +380,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -466,896 +466,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1370,15 +1385,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1400,17 +1415,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1711,261 +1726,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2135,89 +2150,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2265,6 +2298,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2311,7 +2345,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2653,9 +2687,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2717,6 +2751,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2877,7 +2912,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2917,32 +2953,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2953,26 +2989,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3020,7 +3059,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3259,30 +3298,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3294,7 +3339,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3311,16 +3356,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3403,12 +3448,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3491,38 +3541,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3537,28 +3587,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3617,17 +3667,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3985,244 +4035,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4286,12 +4336,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,653 +4366,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5082,15 +5132,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5169,7 +5238,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5228,7 +5297,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5843,75 +5912,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5937,7 +6006,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6204,11 +6273,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6633,86 +6697,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6747,23 +6804,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6773,9 +6830,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6799,7 +6856,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7076,42 +7133,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7238,12 +7297,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7253,25 +7312,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7280,7 +7339,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7334,37 +7393,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7412,85 +7471,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7587,12 +7646,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7602,7 +7661,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7616,22 +7675,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7744,12 +7799,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8002,12 +8057,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8036,23 +8091,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8065,7 +8120,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8417,12 +8472,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8580,7 +8635,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8619,236 +8674,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8856,76 +8911,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8933,50 +8988,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8986,69 +9041,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9067,15 +9122,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9266,47 +9321,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9314,7 +9369,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9322,7 +9377,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9330,7 +9385,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9541,7 +9596,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9687,32 +9742,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9727,34 +9782,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9966,11 +10021,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10075,100 +10130,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10289,106 +10344,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10404,54 +10440,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11338,9 +11374,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/hu/LC_MESSAGES/nova.po b/nova/locale/hu/LC_MESSAGES/nova.po
index b4a7674a0..de558e9b4 100644
--- a/nova/locale/hu/LC_MESSAGES/nova.po
+++ b/nova/locale/hu/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/id/LC_MESSAGES/nova.po b/nova/locale/id/LC_MESSAGES/nova.po
index e19eaeee2..0eec79de0 100644
--- a/nova/locale/id/LC_MESSAGES/nova.po
+++ b/nova/locale/id/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/it/LC_MESSAGES/nova.po b/nova/locale/it/LC_MESSAGES/nova.po
index c25eb846e..b13a1ccd7 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -80,300 +80,300 @@ msgstr "Impossibile riavviare l'istanza"
 msgid "Flags path: %s"
 msgstr "Percorso dei flags: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "E' stato riscontrato un errore sconosciuto"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Parametri inaccettabili."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "La richiesta non è valida."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "E' stato ricevuto un input non valido"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Volume non valido"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -381,86 +381,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "E' stato ricevuto un input non valido"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "istanza %s: ripristino"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -468,896 +468,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "nessun metodo per il messaggio: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1372,15 +1387,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Impossibile riavviare l'istanza"
@@ -1403,17 +1418,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1714,262 +1729,262 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "istanza %s: ripristino"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2140,89 +2155,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2270,6 +2303,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2316,7 +2350,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2661,9 +2695,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2725,6 +2759,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2887,7 +2922,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2929,32 +2965,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2965,26 +3001,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "istanza %s: sospensione in corso"
@@ -3033,7 +3072,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3272,30 +3311,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3307,7 +3352,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3324,16 +3369,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3418,12 +3463,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3506,39 +3556,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3553,28 +3603,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3633,17 +3683,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4005,248 +4055,248 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4311,12 +4361,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4341,665 +4391,665 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Riavviando l'istanza %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Impossibile sospendere l'istanza"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "istanza %s: ricezione diagnostiche"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "istanza %s: ripristino rete"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5119,15 +5169,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5209,7 +5278,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5269,7 +5338,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5887,75 +5956,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5981,7 +6050,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6249,11 +6318,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6683,86 +6747,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Mountpoint %(mountpoint)s montato all'istanza %(instance_name)s"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6797,23 +6854,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6823,9 +6880,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6849,7 +6906,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7126,42 +7183,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7288,12 +7347,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7303,25 +7362,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7330,7 +7389,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7385,37 +7444,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7468,85 +7527,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Impossibile riavviare l'istanza"
@@ -7643,12 +7702,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7658,7 +7717,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7672,22 +7731,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "istanza %s: sospensione in corso"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7800,12 +7855,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8060,12 +8115,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Impossibile localizzare il volume %s"
@@ -8094,23 +8149,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8123,7 +8178,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8478,12 +8533,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8649,7 +8704,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Impossibile montare il volume all'istanza %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8688,240 +8743,240 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: creato con successo"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Impossibile riavviare l'istanza"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "L'utente non ha i privilegi dell'amministratore"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8929,76 +8984,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Impossibile smontare il volume %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9006,50 +9061,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9059,69 +9114,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9140,15 +9195,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9339,47 +9394,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9387,7 +9442,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9395,7 +9450,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9403,7 +9458,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9616,7 +9671,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9762,32 +9817,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9802,34 +9857,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10041,11 +10096,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10150,101 +10205,101 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "istanza %s: creazione snapshot in corso"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "istanza %s: ripristino"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Impossibile localizzare il volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10367,106 +10422,87 @@ 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:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10482,54 +10518,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "Sollevando NotImplemented"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Dichiarando la coda %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11421,9 +11457,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/it_IT/LC_MESSAGES/nova.po b/nova/locale/it_IT/LC_MESSAGES/nova.po
index c3cc96df7..a4df18fe8 100644
--- a/nova/locale/it_IT/LC_MESSAGES/nova.po
+++ b/nova/locale/it_IT/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (Italy) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/ja/LC_MESSAGES/nova.po b/nova/locale/ja/LC_MESSAGES/nova.po
index bed8b8d39..b5fa567d0 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -80,301 +80,301 @@ msgstr "インスタンス終了処�を開始���。"
 msgid "Flags path: %s"
 msgstr "Flags �パス: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "プライベートキー�復��失敗����: %s"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "メッセージ %s �対�るメソッド�存在���ん。"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Invalid signature: ユーザ %s �署���正��。"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -382,86 +382,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "インスタンス %s: rescued"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -469,897 +469,912 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "インスタンス %(instance_name)s �マウント�イント %(mountpoint)s を接続(attach)����"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "インスタンス %(instance_name)s: インスタンスファイル群 %(target)s を削除�����"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "インスタンス %(instance_id)s �アドレス %(public_ip)s を割り当�"
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "ボリュームグループ%s�存在���ん。"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "イメージをループ�ック %s �アタッ�����ん。"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "イメージをループ�ック %s �アタッ�����ん。"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s を�止�よ�������"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "%s を�止�よ�������"
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s �デ�イス %(device)s �接続"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "グループ %s �既�存在�����。"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1374,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
@@ -1405,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1717,265 +1732,265 @@ msgstr "未知�エラー�発生����。�度リクエストを実行
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "未サ�ート� API リクエスト: コントローラ = %(controller)s, アクション = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "プライベートキー�復��失敗����: %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Create key pair: キーペア %s を作����。"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Delete key pair: キーペア %s を削除���。"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "有効�ルールを作��る為��分�パラメータ��り��ん"
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "指定�れ�パラメータ�該当�るルール��り��ん。"
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "指定�れ�ルール�既�グループ %s �存在�����。"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Create volume: %s GB�ボリュームを作����。"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "ボリューム %(volume_id)s をインスタンス %(instance_id)s �デ�イス %(device)s �接続"
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Detach volume: ボリューム %s をデタッ����"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Detach volume: ボリューム %s をデタッ����"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "アトリビュート %s �サ�ート�れ����ん。"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Allocate address: アドレスを割り当���。"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Release address: アドレス %s を開放���。"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "インスタンス %(instance_id)s �アドレス %(public_ip)s を割り当�"
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Disassociate address: アドレス %s �関連付�を解除���。"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Disassociate address: アドレス %s �関連付�を解除���。"
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Disassociate address: アドレス %s �関連付�を解除���。"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reboot instance: インスタンス %r を�起動���。"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "De-registering image: イメージ %s を登録解除���。"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "イメージ %(image_location)s � ID %(image_id)s �登録�れ���"
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "ユーザ���グループ�指定�れ����ん。"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "グループ  \"all\" ��サ�ート�れ����。"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type � add ��� remove �何れ���る必���り��。"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "イメージ %s �公開設定を更新���。"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "インスタンス %s: rescued"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2145,89 +2160,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2275,6 +2308,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2321,7 +2355,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2669,9 +2703,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2733,6 +2767,7 @@ msgstr "例外: Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2896,7 +2931,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2938,33 +2974,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp �実行�れ����ん…"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2975,26 +3011,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "�ットワークホスト�設定を���。"
@@ -3043,7 +3082,7 @@ msgstr "グループ %s �既�存在�����。"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3286,30 +3325,36 @@ msgid "Create networks failed"
 msgstr "�ットワークホスト�設定を���。"
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3321,7 +3366,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "有効�ルールを作��る為��分�パラメータ��り��ん"
 
@@ -3339,16 +3384,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3433,12 +3478,17 @@ msgstr "例外 %s �発生����。"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Release address: アドレス %s を開放���。"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Release address: アドレス %s を開放���。"
@@ -3521,39 +3571,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3568,28 +3618,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "インスタンス %(instance_id)s �アドレス %(public_ip)s を割り当�"
@@ -3648,17 +3698,17 @@ msgstr "%s 用�VPNを起動���。"
 msgid "Failed to load %s"
 msgstr "ボリューム %s �存在�確�����ん。"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4024,253 +4074,253 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "インスタンス�クオータを超����。��タイプ������� %s インスタンス��実行����ん。"
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "インスタンス�クオータを超����。��タイプ������� %s インスタンス��実行����ん。"
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "インスタンス %s �ボリュームを接続(attach)����ん。"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "%s 個�インスタンス�起動を始���…"
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "VM %s �対�るスナップショットを開始���。"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Create Security Group: セキュリティグループ %s を作����。"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "VBD %s �削除�失敗����。"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "VBD %s �削除�失敗����。"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revoke security group ingress: セキュリティグループ許� %s ��消"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Authorize security group ingress: セキュリティグループ許� %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revoke security group ingress: セキュリティグループ許� %s ��消"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4335,12 +4385,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4365,674 +4415,674 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "予期���エラー発生: %s"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "%s を�止�よ�������"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Rebooting instance: インスタンス %s を�起動���。"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Detach volume: ボリューム %s をデタッ����"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Rebooting instance: インスタンス %s を�起動���。"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "インスタンス%s: �起動����。"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "snapshotting: インスタンス %s �スナップショットを�得中"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 #, fuzzy
 msgid "Unrescuing"
 msgstr "Unrescuing: インスタンス %s をアンレスキュー���。"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "snapshotting: インスタンス %s �スナップショットを�得中"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "retrieving diagnostics: インスタンス %s �診断情報を�得���。"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 #, fuzzy
 msgid "Inject network info"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "コンソールを追加�����"
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "コンソールを追加�����"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "ボリュームを未知�インスタンス %s �らデタッ����。"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Deleting user: ユーザ %s を削除���。"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Deleting user: ユーザ %s を削除���。"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5152,15 +5202,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "コンソールを追加�����"
@@ -5240,7 +5309,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5299,7 +5368,7 @@ msgstr "インスタンス %s: rescued"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5917,78 +5986,78 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "�ットワークホスト�設定を���。"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revoke security group ingress: セキュリティグループ許� %s ��消"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Delete security group: セキュリティグループ %s を削除���。"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "エラー %s をキャッ�����。"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Authorize security group ingress: セキュリティグループ許� %s"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6014,7 +6083,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6282,11 +6351,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6716,86 +6780,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6830,23 +6887,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6856,9 +6913,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6882,7 +6939,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7159,42 +7216,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "インスタンス %s �実行中��。"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "インスタンス %s を終了��後��。"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7322,12 +7381,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7337,25 +7396,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7364,7 +7423,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7418,37 +7477,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7501,85 +7560,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "ファイルパス '%s' を埋�込ん����"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
@@ -7676,12 +7735,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7691,7 +7750,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7705,22 +7764,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7833,12 +7888,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8092,12 +8147,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "ファイルパス '%s' を埋�込ん����"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "ファイルシステム %s �マウント�失敗����。"
@@ -8126,23 +8181,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Get console output: インスタンス %s �コンソール出力を�得���。"
@@ -8156,7 +8211,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8512,12 +8567,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "インスタンス終了処�を開始���。"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "ファイルパス '%s' を埋�込ん����"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "ファイルパス '%s' を埋�込ん����"
@@ -8683,7 +8738,7 @@ msgstr "ボリューム切断: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "raw instanceを生����。"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8722,238 +8777,238 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "libvirt %s �接続���。"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "ボリュームグループ%s�存在���ん。"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "libvirt��接続�切れ����。"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "libvirt %s �接続���。"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "%s を�止�よ�������"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "インスタンス%s: �起動����。"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "データ: %(data)r, ファイルパス: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "ID %(image_id)s ��� %(vdi_uuids)s �アップロード�為� xapi を����������"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "インスタンス %(inst_name)s: イメージ %(img_id)s ��データ埋�込��エラーを無視����� (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8961,76 +9016,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "ip %s �対�るメタデータ��得�失敗����。"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9038,50 +9093,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9091,69 +9146,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "%s ��証�失敗����。"
+#: nova/virt/libvirt/driver.py:3332
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9172,15 +9227,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9371,47 +9426,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9419,7 +9474,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9427,7 +9482,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9435,7 +9490,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9647,7 +9702,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9793,32 +9848,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9833,34 +9888,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10074,12 +10129,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "xvp を�起動�����"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "�スト��戻り値: %s"
@@ -10187,101 +10242,101 @@ msgstr "%s 個�インスタンス�起動を始���…"
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "インスタンス %s: 起動����。"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Deleting user: ユーザ %s を削除���。"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "インスタンス %s: rescued"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Deleting user: ユーザ %s を削除���。"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "ボリューム %s �存在�確�����ん。"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10404,106 +10459,87 @@ 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:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "getter %s をコール���。"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "ファイルパス '%s' を埋�込ん����"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL エラー: %s"
@@ -10522,54 +10558,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "プライベートキー�復��失敗����: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "例外 %s �発生����。"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "NotImplemented 例外を発生����。"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake �� %s �実装�れ����ん。"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "getter %s をコール���。"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "getter %s をコール���。"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11469,9 +11505,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/ka_GE/LC_MESSAGES/nova.po b/nova/locale/ka_GE/LC_MESSAGES/nova.po
index 9bf6bb480..5a60f3802 100644
--- a/nova/locale/ka_GE/LC_MESSAGES/nova.po
+++ b/nova/locale/ka_GE/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Georgian (Georgia) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/ko/LC_MESSAGES/nova.po b/nova/locale/ko/LC_MESSAGES/nova.po
index 143e630bc..0b565f2d0 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,299 +79,299 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr "플래그 경로: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "%s 볼륨 탈착� 실패했습니다"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2653,9 +2687,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2717,6 +2751,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2878,7 +2913,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2920,32 +2956,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2956,26 +2992,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "�스턴스 %s: 스냅샷 저장중"
@@ -3024,7 +3063,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3263,30 +3302,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3298,7 +3343,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3360,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3407,12 +3452,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3495,39 +3545,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3542,28 +3592,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3622,17 +3672,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "%s 볼륨� 찾�수 없습니다"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3991,245 +4041,245 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "%s 볼륨� 찾�수 없습니다"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "%s 볼륨� 찾�수 없습니다"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4293,12 +4343,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4323,661 +4373,661 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "%s 볼륨 탈착� 실패했습니다"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "�스턴스 %s를 재부팅합니다"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5097,15 +5147,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5184,7 +5253,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5243,7 +5312,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5858,75 +5927,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5952,7 +6021,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6219,11 +6288,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6648,86 +6712,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 장착�었습니다"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6762,23 +6819,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6788,9 +6845,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6814,7 +6871,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7091,42 +7148,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7253,12 +7312,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7268,25 +7327,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7295,7 +7354,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7349,37 +7408,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7432,85 +7491,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7607,12 +7666,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7622,7 +7681,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7636,22 +7695,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7764,12 +7819,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8023,12 +8078,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "%s 볼륨� 찾�수 없습니다"
@@ -8057,23 +8112,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8086,7 +8141,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8440,12 +8495,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8610,7 +8665,7 @@ msgstr "볼륨 탈착: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "%s �스턴스� 볼륨장착 할 수 없습니다"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8649,236 +8704,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8886,76 +8941,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "%s 볼륨 탈착� 실패했습니다"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8963,50 +9018,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9016,69 +9071,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9097,15 +9152,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9296,47 +9351,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9344,7 +9399,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9352,7 +9407,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9360,7 +9415,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9572,7 +9627,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9718,32 +9773,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9758,34 +9813,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9997,11 +10052,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10106,100 +10161,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "�스턴스 %s: 스냅샷 저장중"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "%s 볼륨� 찾�수 없습니다"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10322,106 +10377,87 @@ msgstr "%s 볼륨 탈착� 실패했습니다"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "%(instance_name)s �스턴스� %(mountpoint)s 마운트지�� 탈착�었습니다"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10437,54 +10473,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11373,9 +11409,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/ko_KR/LC_MESSAGES/nova.po b/nova/locale/ko_KR/LC_MESSAGES/nova.po
index 7f1204815..28bc3a6e7 100644
--- a/nova/locale/ko_KR/LC_MESSAGES/nova.po
+++ b/nova/locale/ko_KR/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-06 16:05+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: en_US <LL@li.org>\n"
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "가� �터페�스 �성 실패"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "���지 않�."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Keypair ��터가 맞지 않습니다"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "그 요청� 맞지 않습니다."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "입력 값� 정확하지 않습니다."
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "�스턴스 잠�기 실패"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "�스턴스 재시작 실패"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "CPU 정보를 받�수 없습니다."
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s는 v4/6주소� 맞지 않� IP입니다."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Disk format %(disk_format)s를 알 수 없습니다."
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "주소 할당"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "주소 릴리즈 %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2653,9 +2687,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2717,6 +2751,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2877,7 +2912,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2917,32 +2953,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2953,26 +2989,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3020,7 +3059,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3259,30 +3298,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3294,7 +3339,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3311,16 +3356,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3403,12 +3448,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "주소 릴리즈 %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "주소 릴리즈 %s"
@@ -3491,39 +3541,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "�스턴스 재시작 실패"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3538,28 +3588,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3618,17 +3668,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3986,244 +4036,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4287,12 +4337,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4317,653 +4367,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5083,15 +5133,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5170,7 +5239,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5229,7 +5298,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5844,75 +5913,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5938,7 +6007,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6205,11 +6274,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6634,86 +6698,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6748,23 +6805,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6774,9 +6831,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6800,7 +6857,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7077,42 +7134,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7239,12 +7298,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7254,25 +7313,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7281,7 +7340,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7335,37 +7394,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7413,85 +7472,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7588,12 +7647,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7603,7 +7662,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7617,22 +7676,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7745,12 +7800,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8003,12 +8058,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8037,23 +8092,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8066,7 +8121,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8418,12 +8473,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8581,7 +8636,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8620,236 +8675,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8857,76 +8912,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8934,50 +8989,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8987,69 +9042,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9068,15 +9123,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9267,47 +9322,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9315,7 +9370,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9323,7 +9378,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9331,7 +9386,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9542,7 +9597,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9688,32 +9743,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9728,34 +9783,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9967,11 +10022,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10076,100 +10131,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10290,106 +10345,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10405,54 +10441,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11340,9 +11376,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/ms/LC_MESSAGES/nova.po b/nova/locale/ms/LC_MESSAGES/nova.po
index 21ec75fc4..8148594ee 100644
--- a/nova/locale/ms/LC_MESSAGES/nova.po
+++ b/nova/locale/ms/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/nb/LC_MESSAGES/nova.po b/nova/locale/nb/LC_MESSAGES/nova.po
index 0c9511f97..5dc61e4a3 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -81,298 +81,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "En ukjent feil oppsto."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Kunne ikke dekryptere teksten"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Kunne ikke dekryptere teksten"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Ikke autorisert."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Bruker har ikke admin-rettigheter"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "Forespørselen er ugyldig."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Ugyldig IP protokoll %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s er ikke en gyldig IP v4/6 addresse."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -380,85 +380,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Ressurs ble ikke funnet."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -466,896 +466,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Nettverk %(network_id)s ble ikke funnet."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Nettverk %(network_id)s ble ikke funnet."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Ingen nettverk definert."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "Handlingen er ikke tillatt."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "Nøkkelpar '%s' finnes allerede."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Kvote overskredet"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Prosjekt %(project_id)s ble ikke funnet."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1370,15 +1385,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1400,17 +1415,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1711,261 +1726,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Lag nøkkelpar %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "Importer nøkkel %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Slett nøkkelpar %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Ugyldig IP protokoll %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Ingen regel for de angitte parametrene."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Tildel adresse"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Frigjør adresse %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "bruker eller gruppe ikke spesifisert"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "kun gruppe \"all\" er støttet"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2136,89 +2151,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Laster utvidelse %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Kunne ikke laste utvidelse %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "Kunne ikke laste utvidelse %(classpath)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Kunne ikke laste utvidelse %(ext_name)s: %(exc)s"
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2266,6 +2299,7 @@ msgstr "Ingen slik handling: %s"
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2312,7 +2346,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2657,9 +2691,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2721,6 +2755,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr "Tjener ikke funnet"
 
@@ -2881,7 +2916,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2921,33 +2957,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Ugyldig snapshot"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Nøkkelpar '%s' finnes allerede."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2958,26 +2994,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "Metadata element ble ikke funnet"
@@ -3026,7 +3065,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3267,30 +3306,36 @@ msgid "Create networks failed"
 msgstr "Ingen nettverk definert."
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3302,7 +3347,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Ikke nok parametere for å lage en gyldig regel."
 
@@ -3320,16 +3365,16 @@ msgstr "Viser nettverk med id %s"
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Sletter nettverk med id %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3412,12 +3457,17 @@ msgstr "Laster utvidelse %s"
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Frigjør adresse %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Frigjør adresse %s"
@@ -3500,38 +3550,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Tjeneste %(service_id)s ble ikke funnet."
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3546,28 +3596,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3626,17 +3676,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "Kan ikke finne adressen %r"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3996,244 +4046,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4297,12 +4347,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4327,653 +4377,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Kunne ikke hente metadata for ip:% s"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5093,15 +5143,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5180,7 +5249,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5239,7 +5308,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5856,75 +5925,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5950,7 +6019,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6217,11 +6286,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6647,86 +6711,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6761,23 +6818,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6787,9 +6844,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6813,7 +6870,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7091,42 +7148,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7254,12 +7313,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7269,25 +7328,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7296,7 +7355,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7350,37 +7409,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7429,85 +7488,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7605,12 +7664,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7620,7 +7679,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7634,22 +7693,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "Metadata element ble ikke funnet"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7762,12 +7817,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8020,12 +8075,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Kan ikke finne adressen %r"
@@ -8054,23 +8109,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8083,7 +8138,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8435,12 +8490,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8598,7 +8653,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8637,238 +8692,238 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Ingen nettverk definert."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Ingen nettverk definert."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8876,76 +8931,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8953,50 +9008,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9006,69 +9061,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9087,15 +9142,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9286,47 +9341,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Forventet objekt av typen: %s"
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9334,7 +9389,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9342,7 +9397,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9350,7 +9405,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9561,7 +9616,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9707,32 +9762,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9747,34 +9802,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9986,11 +10041,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10095,100 +10150,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10311,106 +10366,87 @@ msgstr "Kan ikke finne adressen %r"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10426,54 +10462,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11362,9 +11398,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/nl_NL/LC_MESSAGES/nova.po b/nova/locale/nl_NL/LC_MESSAGES/nova.po
index 980a5e0a4..875e5f373 100644
--- a/nova/locale/nl_NL/LC_MESSAGES/nova.po
+++ b/nova/locale/nl_NL/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Dutch (Netherlands) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/nova.pot b/nova/locale/nova.pot
index 65a769538..8d87f807b 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.282\n"
+"Project-Id-Version: nova jenkins.nova.propose.translation.update.289\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1383,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1413,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1709,261 +1724,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2133,89 +2148,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2263,6 +2296,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2309,7 +2343,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2651,9 +2685,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2715,6 +2749,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2875,7 +2910,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2915,32 +2951,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2951,26 +2987,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3018,7 +3057,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3257,30 +3296,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3292,7 +3337,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3309,16 +3354,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3401,12 +3446,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3489,38 +3539,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3535,28 +3585,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3615,17 +3665,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3983,244 +4033,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4284,12 +4334,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4314,653 +4364,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5080,15 +5130,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5167,7 +5236,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5226,7 +5295,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5841,75 +5910,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,7 +6004,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6202,11 +6271,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6631,86 +6695,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6745,23 +6802,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6771,9 +6828,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6797,7 +6854,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7074,42 +7131,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7236,12 +7295,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7251,25 +7310,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7278,7 +7337,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7332,37 +7391,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7410,85 +7469,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7585,12 +7644,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7600,7 +7659,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7614,22 +7673,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7742,12 +7797,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8000,12 +8055,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8034,23 +8089,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8063,7 +8118,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8415,12 +8470,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8578,7 +8633,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8617,236 +8672,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8854,76 +8909,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8931,50 +8986,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8984,69 +9039,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9065,15 +9120,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9264,47 +9319,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9312,7 +9367,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9320,7 +9375,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9328,7 +9383,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9539,7 +9594,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9685,32 +9740,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9725,34 +9780,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9964,11 +10019,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10073,100 +10128,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10287,106 +10342,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10402,54 +10438,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
diff --git a/nova/locale/pt/LC_MESSAGES/nova.po b/nova/locale/pt/LC_MESSAGES/nova.po
index 813f61199..03fbecea6 100644
--- a/nova/locale/pt/LC_MESSAGES/nova.po
+++ b/nova/locale/pt/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/pt_BR/LC_MESSAGES/nova.po b/nova/locale/pt_BR/LC_MESSAGES/nova.po
index 2e050aac6..42c2c39b8 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -80,301 +80,301 @@ msgstr "Falhou ao reiniciar instância"
 msgid "Flags path: %s"
 msgstr "Localização dos sinalizadores: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Falhou ao descriptografar texto"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Falhou ao descriptografar texto"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Não autorizado."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Parâmetros inaceitáveis."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "A requisição é inválida."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Dados recebidos é inválido"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Volume inválido"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "Assinatura inválida para usuário %s"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Sequencia de porta %(from_port)s:%(to_port)s é inválida. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Protocolo IP %(protocol)s é inválido."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Tipo de conteúdo %(content_type)s é inválido."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Falhou em atualizar senha: %(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Falha ao suspender instância"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Serviço está indisponível neste momento"
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Serviço está indisponível neste momento"
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s não é um endereço IPv4/6 válido."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -382,86 +382,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Formato do disco %(disk_format)s não é aceito"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Dados recebidos é inválido"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "Instância não existe"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -469,897 +469,912 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s é necessário para criar a rede."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Nenhuma rede definida."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Rede %(network_id)s não foi encontrada."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Ponto de montagem %(mountpoint)s conectada à instância %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "Removendo rede com id %s"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Interface %(interface)s não encontrada."
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Serviço %(service_id)s não encontrado."
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Host %(host)s não encontrado."
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Usuário %(user_id)s não foi encontrado."
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Tipo de conteúdo %(content_type)s é inválido."
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "Instância não existe"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Volume %(volume_id)s não pode ser encontrado."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Imagem %(image_id)s não foi encontrada."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Kernel não encontrado para a imagem %(image_id)s."
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Projeto %(project_id)s não foi encontrado."
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "group %s já existe"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1374,15 +1389,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Falha ao obter metadados para o ip: %s"
@@ -1405,17 +1420,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1717,265 +1732,265 @@ msgstr "Ocorreu um erro desconhecido. Por favor tente sua requisição novamente
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Criar par de chaves %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Remover par de chaves %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Protocolo IP %(protocol)s é inválido."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Não existe regra para os parâmetros especificados"
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Esta regra já existe no grupo %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Criar volume de %s GB"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Desanexar volume %s"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "atributo não suportado: %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Alocar endereço"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "Liberar endereço %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Desatribuir endereço %s"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Começando a terminar instâncias"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Reiniciar instância %r"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "usuário ou grupo não especificado"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "apenas o grupo \"all\" é suportado"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type deve ser add ou remove"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Atualizando publicidade da imagem %s"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "Instância não existe"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2146,89 +2161,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2276,6 +2309,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr "Corpo do pedido está mal formado"
 
@@ -2322,7 +2356,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2671,9 +2705,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2735,6 +2769,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2898,7 +2933,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2940,32 +2976,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Rede já existe!"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2976,26 +3012,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "Certificado %(certificate_id)s não encontrado."
@@ -3046,7 +3085,7 @@ msgstr "group %s já existe"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3291,30 +3330,36 @@ msgid "Create networks failed"
 msgstr "Nenhuma rede definida."
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3326,7 +3371,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3344,16 +3389,16 @@ msgstr "Mostrando rede com id %s"
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Removendo rede com id %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3438,12 +3483,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "Liberar endereço %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "Liberar endereço %s"
@@ -3526,39 +3576,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3573,28 +3623,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
@@ -3653,17 +3703,17 @@ msgstr "Executando VPN para %s"
 msgid "Failed to load %s"
 msgstr "Não foi possível criar volume"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4030,252 +4080,252 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "Não é possível anexar o volume na instância %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "A instância %(instance_id)s não está executando."
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Criar Grupo de Segurança %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "Não é possível destruir o VBD %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4340,12 +4390,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4370,673 +4420,673 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "Erro inexperado lançado: %s"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "Removendo rede com id %s"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Começando a terminar instâncias"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Reconstruindo instância %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Desanexar volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Reiniciando a instância %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "instância %s: fazendo um snapshot"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Falha ao suspender instância"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 #, fuzzy
 msgid "Unrescuing"
 msgstr "instância %s: desfazendo o resgate"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "Iniciando instância %s"
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Instância não existe"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "instância %s: recuperando os diagnósticos"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "instância %s: reset da rede"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Adicionando console"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "Desconectando volume da instância desconhecida %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Falha ao obter metadados para o ip: %s"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Remover volume com id: %s"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "Instância %s não encontrada"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Removendo imagem %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "Iniciando instância %s"
@@ -5156,15 +5206,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "Adicionando console"
@@ -5245,7 +5314,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5305,7 +5374,7 @@ msgstr "Corpo do pedido está mal formado"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5923,78 +5992,78 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "Removendo rede com id %s"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Capturado o erro: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Revogado entrada do grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Excluir grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Capturado o erro: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Autorizada entrada do grupo de segurança %s"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6020,7 +6089,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6288,11 +6357,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6723,86 +6787,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "Iniciando instância %s"
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "Volume não encontrada para a instância %(instance_id)s."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6837,23 +6894,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6863,9 +6920,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6889,7 +6946,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7166,42 +7223,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr "Erro interno"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7329,12 +7388,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7344,25 +7403,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Não foi possível carregar o driver de virtualização: %s"
@@ -7372,7 +7431,7 @@ msgstr "Não foi possível carregar o driver de virtualização: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7427,37 +7486,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7511,85 +7570,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "tipo de instância %(instance_type)s é inválida."
@@ -7687,12 +7746,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7702,7 +7761,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7716,22 +7775,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "nenhuma partição encontrada"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "nenhuma partição encontrada"
@@ -7844,12 +7899,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8104,12 +8159,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Falhou em montar sistema de arquivo: %s"
@@ -8138,23 +8193,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Obter saída do console para instância %s"
@@ -8168,7 +8223,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8524,12 +8579,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Começando a terminar instâncias"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8695,7 +8750,7 @@ msgstr "Detach_volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "Obter saída do console para instância %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8734,244 +8789,244 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Nenhuma rede definida."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Nenhuma rede definida."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "volume %s: criado com sucesso"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Falhou ao reiniciar instância"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Usuário não tem privilégios de administrador"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 "Solicitando à xapi para realizar upload da imagem %(vdi_uuids)s com ID "
 "%(image_id)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8979,76 +9034,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Obtendo o tamanho da imagem para a imagem %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9056,50 +9111,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9109,69 +9164,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Falha de Autenticação: %s"
+#: nova/virt/libvirt/driver.py:3332
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9190,15 +9245,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9389,47 +9444,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Objeto esperado do tipo: %s"
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9437,7 +9492,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9445,7 +9500,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9453,7 +9508,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9666,7 +9721,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9812,32 +9867,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "nenhuma partição encontrada"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9852,34 +9907,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "Sessão inválida"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10092,12 +10147,12 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Removendo o registro da imagem %s"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10204,101 +10259,101 @@ msgstr "Começando a terminar instâncias"
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Atualizando agente para %s"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Remover volume com id: %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "Instância não existe"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Remover volume com id: %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Não é possível localizar o volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10421,106 +10476,87 @@ 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:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Atualizando agente para %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "Configurar senha do administrador"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Erro de OpenSSL: %s"
@@ -10536,54 +10572,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "Aumento não implementado"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake não tem uma implementação para %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Chamando o pai %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11481,9 +11517,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr "Certificado %(certificate_id)s não encontrado."
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/ro/LC_MESSAGES/nova.po b/nova/locale/ro/LC_MESSAGES/nova.po
index 4b2a1d2a0..9f72dffd5 100644
--- a/nova/locale/ro/LC_MESSAGES/nova.po
+++ b/nova/locale/ro/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-06-10 18:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Romanian "
@@ -81,298 +81,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -380,85 +380,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -466,896 +466,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1370,15 +1385,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1400,17 +1415,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1711,261 +1726,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2135,89 +2150,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2265,6 +2298,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2311,7 +2345,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2653,9 +2687,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2717,6 +2751,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2877,7 +2912,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2917,32 +2953,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2953,26 +2989,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3020,7 +3059,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3259,30 +3298,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3294,7 +3339,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3311,16 +3356,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3403,12 +3448,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3491,38 +3541,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3537,28 +3587,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3617,17 +3667,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3985,244 +4035,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4286,12 +4336,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,653 +4366,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5082,15 +5132,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5169,7 +5238,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5228,7 +5297,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5843,75 +5912,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5937,7 +6006,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6204,11 +6273,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6633,86 +6697,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6747,23 +6804,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6773,9 +6830,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6799,7 +6856,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7076,42 +7133,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7238,12 +7297,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7253,25 +7312,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7280,7 +7339,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7334,37 +7393,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7412,85 +7471,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7587,12 +7646,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7602,7 +7661,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7616,22 +7675,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7744,12 +7799,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8002,12 +8057,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8036,23 +8091,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8065,7 +8120,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8417,12 +8472,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8580,7 +8635,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8619,236 +8674,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8856,76 +8911,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8933,50 +8988,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8986,69 +9041,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9067,15 +9122,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9266,47 +9321,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9314,7 +9369,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9322,7 +9377,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9330,7 +9385,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9541,7 +9596,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9687,32 +9742,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9727,34 +9782,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9966,11 +10021,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10075,100 +10130,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10289,106 +10344,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10404,54 +10440,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11338,9 +11374,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/ru/LC_MESSAGES/nova.po b/nova/locale/ru/LC_MESSAGES/nova.po
index 849527266..6ef21de13 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -84,180 +84,180 @@ msgstr "Ошибка перезагрузки копии"
 msgid "Flags path: %s"
 msgstr "Ра�положение флагов: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Обнаружено неизве�тное и�ключение."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Ошибка дешифровки тек�та"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Ошибка дешифровки тек�та"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Ошибка �оздани� виртуального интерфей�а"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 "5 безу�пешных попыток �оздани� виртуального интерфей�а � уникальным "
 "mac-адре�ом"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "�е авторизировано."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Пользователь не имеет админи�тративных привилегий"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Политика не допу�кает выполнени� %(action)s."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "Ядро не найдено дл� образа %(image_id)s."
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "�едопу�тимые параметры."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 #, fuzzy
 msgid "Block Device Mapping is Invalid."
 msgstr "block_device_mapping %s"
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "Том %(volume_id)s никуда не при�оединён"
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "�едопу�тимый запро�."
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "�едопу�тимый том"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "�едопу�тимые метаданные"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "�еправильный ключ метаданных"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "�едопу�тимый диапазон портов %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "�едопу�тимый протокол IP %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "�едопу�тимый тип �одержимого %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "�едопу�тимый cidr %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "Допу�тимый узел не найден. %(reason)s"
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -266,86 +266,86 @@ msgstr ""
 "Копи� %(instance_uuid)s в %(attr)s %(state)s. �евозможно %(method)s во "
 "врем� нахождени� копии в �том �о�то�нии."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "Копи� %(instance_id)s не выполн�ет��."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "Копи� %(instance_id)s не переведена в режим во��тановлени�"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "Копи� %(instance_id)s не переведена в режим во��тановлени�"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "Копи� %(instance_id)s не переведена в режим прио�тановлени�."
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Ошибка обновлени� парол�: %(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "�евозможно назначить пароль админи�тратора. Копи� %s не выполн�ет��"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "�евозможно назначить пароль админи�тратора. Копи� %s не выполн�ет��"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "В данный момент �лужба недо�тупна."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Служба Compute недо�тупна в на�то�щее врем�."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "�евозможно переме�тить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Копии необходима нова� вер�и� гипервизора, вме�то предо�тавленной."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
@@ -354,38 +354,38 @@ msgstr ""
 "Предо�тавленный адре� ди�ка (%(path)s) уже �уще�твует, но ожидало�ь, что "
 "от�ут�твует."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "�едопу�тимое размещение предо�тавленного у�трой�тва (%(path)s)."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "�едопу�тимое размещение предо�тавленного у�трой�тва (%(path)s)."
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "�едопу�тимое размещение предо�тавленного у�трой�тва (%(path)s)."
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "�едопу�тимые �ведени� ЦПУ"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s не �вл�ет�� допу�тимым IP-адре�ом в4/6."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -393,86 +393,86 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "Форматирование ди�ка %(disk_format)s недопу�тимо"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "Образ %(image_id)s недопу�тим: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "Копи� %(instance_id)s недопу�тима: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s недопу�тим."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "�едопу�тимый cidr %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "копи� - %s не пред�тавлена"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Ре�ур� не может быть найден."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "От�ут�твует ди�к в %(location)s"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "�евозможно найти обработчик дл� тома %(driver_type)s."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "�едопу�тимый образ href %(image_href)s."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -480,65 +480,65 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "�евозможно найти SR дл� чтени�/запи�и VDI."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "%(req)s необходимо дл� �оздани� �ети."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "Сеть не может быть найдена дл� мо�та %(bridge)s"
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "Сеть не может быть найдена дл� uuid %(uuid)s"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "Сеть не найдена � cidr %(cidr)s."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "Сеть не найдена дл� копии %(instance_id)s."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Сети не определены."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -547,233 +547,233 @@ msgstr ""
 "Или uuid %(network_uuid)s �ети не предо�тавлено или не при�воено проекту "
 "%(project_id)s."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "Сеть %(network_id)s не найдена."
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "Сеть не найдена дл� копии %(instance_id)s."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "Сеть не найдена дл� копии %(instance_id)s."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "Копи� %(instance_id)s не найдена"
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "Копи� %(instance_id)s не найдена"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "При�воить адре� %(public_ip)s копии %(instance_id)s"
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "�едопу�тимый фик�ированный IP-адре� %(address)s."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "Тип тома %(name)s уже �уще�твует."
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "Запи�ь DNS %(name)s уже �уще�твует в домене %(domain)s."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "у�тановка �етевого узла"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "Интерфей� %(interface)s не найден."
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "Служба %(service_id)s не найдена."
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "Узел %(host)s не найден."
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "Узел �ompute %(host)s не найден."
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Квота не найдена"
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "Кла�� %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "Пользователь %(user_id)s не найден."
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Ра�ширенный ре�ур�: %s"
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "Группа безопа�но�ти %(security_group_id)s не найдена."
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "Группа безопа�но�ти %(security_group_id)s не найдена дл� проекта "
 "%(project_id)s."
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "Группа безопа�но�ти � правилом %(rule_id)s не найдена."
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -782,7 +782,7 @@ msgstr ""
 "Группа безопа�но�ти %(security_group_id)s уже а��оциирована � копией "
 "%(instance_id)s"
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -791,603 +791,618 @@ msgstr ""
 "Группа безопа�но�ти %(security_group_id)s не а��оциирована � копией "
 "%(instance_id)s"
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "Группа безопа�но�ти � правилом %(rule_id)s не найдена."
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "Перемещение %(migration_id)s не найдено."
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "Перемещение не найдено дл� копии %(instance_id)s в �о�то�нии %(status)s."
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "Пул кон�оли %(pool_id)s не найден."
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "Кон�оль %(console_id)s не найдена."
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "Кон�оль дл� копии %(instance_id)s не найдена."
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "Кон�оль дл� копии %(instance_id)s в пуле %(pool_id)s не найдена."
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "�едопу�тимый тип кон�оли %(console_type)s "
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "Тип копии � названием %(instance_type_name)s не найден."
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "том группы %s не �уще�твует"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "�е найден том дл� копии %(instance_id)s."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "Копи� %(instance_id)s не имеет метаданных � ключом %(metadata_key)s."
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "Копи� %(instance_id)s не имеет метаданных � ключом %(metadata_key)s."
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "Файл %(file_path)s не может быть найден."
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "�е найден виртуальный переключатель а��оциированный � �етевым адаптером "
 "%(adapter)s."
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "Сетевой адаптер %(adapter)s не может быть найден."
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "Кла�� %(class_name)s не найден: %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "Дей�твие не разрешено."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "Копи� %(name)s уже �уще�твует."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "Копи� %(name)s уже �уще�твует."
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "Тип копии %(name)s уже �уще�твует."
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "Тип копии %(name)s уже �уще�твует."
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s ра�полагает�� на общедо�тупном накопителе: %(reason)s"
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s ра�полагает�� на общедо�тупном накопителе: %(reason)s"
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "Ошибка перемещени�"
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "Ошибка перемещени�"
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "�еправильное тело �ообщени�: %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "�евозможно найти конфигурацию по адре�у %(path)s"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "При изменении размера, копии должны изменить размер!"
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "�едо�таточно пам�ти на узле �ети compute дл� запу�ка %(uuid)s."
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Допу�тимый узел не найден. %(reason)s"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Превышена квота"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "Превышена квота дл� %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "Выбрано мак�. количе�тво узлов (%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "Выбрано мак�. количе�тво узлов (%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "Выбрано мак�. количе�тво узлов (%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "Выбрано мак�. количе�тво узлов (%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "Выбрано мак�. количе�тво узлов (%d)"
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "�евозможно назначить пароль админи�тратора. Копи� %s не выполн�ет��"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "Копи� %(instance_id)s не найдена."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "Кон�оль дл� копии %(instance_id)s не найдена."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "Том %(volume_id)s не найден."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "Снимок %(snapshot_id)s не может быть найден."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "Образ %(image_id)s не найден."
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "Получение образа %(image)s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "Копи� %(instance_id)s не найдена"
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "Подключить том %(volume_id)s дл� копии %(instance_id)s на %(device)s"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "Квота проекта %(project_id)s не найдена."
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "Проект %(project_id)s не найден."
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "Копи� %(instance_id)s не переведена в режим во��тановлени�"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "Копи� %(instance_id)s не переведена в режим во��тановлени�"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "Тип копии %(name)s уже �уще�твует."
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Ожидал�� объект типа: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1402,15 +1417,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Ошибка получени� метаданных дл� ip: %s"
@@ -1433,17 +1448,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1751,270 +1766,270 @@ msgstr ""
 "�еподдерживаемый запро� API: контроллер = %(controller)s, дей�твие = "
 "%(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Создать �нимок тома %s"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "Ошибка дешифрировани� личного ключа: %s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "Создание пары ключей %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "Импортировать ключ %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "Удаление пары ключей %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "�едо�таточно параметров дл� �бора правильного правила."
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "�едопу�тимый протокол IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "От�ут�твует правило дл� заданных параметров."
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Это правило уже �уще�твует в группе %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "Получить кон�ольный вывод дл� копии %s"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "Создать том из �нимка %s"
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Создание раздела %s ГБ"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 #, fuzzy
 msgid "Delete Failed"
 msgstr "Ошибка �оздани�"
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "Подключить том %(volume_id)s дл� копии %(instance_id)s на %(device)s"
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 #, fuzzy
 msgid "Attach Failed."
 msgstr "Ошибка �оздани�"
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "От�оединить том %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "От�оединить том %s"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "аттрибут не поддерживает��: %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Выделить адре�"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "При�воить адре� %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "�евозможно найти адре� %r"
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "При�воить адре� %(public_ip)s копии %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "�евозможно найти адре� %r"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "�евозможно найти адре� %r"
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "И�ключить адре� %s"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "Образ должен быть до�тупен"
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Выполнение завершени� работы копий"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "Перезагрузить копию %r"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "Выполнение о�тановки копий"
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "И�ключение реги�трации образа %s"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "Зареги�трированный образ %(image_location)s � идентификатором %(image_id)s"
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "не указан пользователь или группа"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "поддерживает�� только группа \"в�е(all)\""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "Обновление о�ведомлённо�ти об образе %s"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "�евозможно о�тановить копию в течении %d �."
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "Перечень копий"
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "копи� - %s не пред�тавлена"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "Перечень копий"
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "�едопу�тимый cidr %(cidr)s."
@@ -2190,89 +2205,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr "�едопу�тимые метаданные"
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "�евозможно '%(action)s', когда копи� в %(attr)s %(state)s"
 
 #: nova/api/openstack/common.py:366
+#, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "Копи� в недопу�тимом �о�то�нии дл� '%(action)s'"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Отклонение запро�а �нимка, �нимки в данный момент отключены"
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Снимки копии в на�то�щий момент недопу�тимы."
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Загруженное ра�ширение: %s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Загрузка ра�ширени� %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "Ошибка загрузки ра�ширени� %(ext_factory)s: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "Ошибка загрузки ра�ширени� %(ext_name)s: %(exc)s"
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2320,6 +2353,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr "�еправильное тело запро�а"
 
@@ -2366,7 +2400,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr "Инициализаци� ди�петчера ра�ширений."
 
@@ -2719,9 +2753,9 @@ msgstr "Запро�ы изменение размера требуют атри
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr "�едопу�тимый запро� тела"
@@ -2783,6 +2817,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr "Сервер не найден"
 
@@ -2949,7 +2984,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2991,34 +3027,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp не выполн�ет��..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "�едопу�тимый �нимок"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "Группа безопа�но�ти %s уже �уще�твует"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -3029,26 +3065,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Ошибка перемещени� %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "Сертификат %(certificate_id)s не найден."
@@ -3099,7 +3138,7 @@ msgstr "Тип тома %(name)s уже �уще�твует."
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3348,30 +3387,36 @@ msgid "Create networks failed"
 msgstr "Ошибка �оздани�"
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3383,7 +3428,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "�едо�таточно параметров дл� �бора правильного правила."
 
@@ -3402,16 +3447,16 @@ msgstr "Отображение �ети � идентификатором %s"
 msgid "security group default rule not found"
 msgstr "Группа безопа�но�ти � правилом %(rule_id)s не найдена."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "�едопу�тимый префик� дл� to_global_ipv6: %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "Группа безопа�но�ти не задана"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "�аименование группы безопа�но�ти не может от�ут�твовать"
 
@@ -3497,12 +3542,17 @@ msgstr "Загруженное ра�ширение: %s"
 msgid "Ext version: %i"
 msgstr "Вер�и� агента копии: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "При�воить адре� %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "При�воить адре� %s"
@@ -3585,39 +3635,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "�е найден том дл� копии %(instance_id)s."
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "�е найден том дл� копии %(instance_id)s."
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3632,28 +3682,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "�е найден том дл� копии %(instance_id)s."
@@ -3712,17 +3762,17 @@ msgstr "Запу�к VPN дл� %s"
 msgid "Failed to load %s"
 msgstr "�евозможно �оздать том"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "�лемент не �вл�ет�� потомком"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4093,26 +4143,26 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr ""
 "Превышена квота копий. Вы не можете запу�тить дополнительные копии �того "
 "типа."
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "Превышена квота копий. Вы можете запу�тить только %s копий �того типа."
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "Превышена квота дл� %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
@@ -4121,97 +4171,97 @@ msgstr ""
 "Превышена квота дл� %(pid)s, попытка назначить %(num_metadata)s �вой�тв "
 "метаданных"
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "�евозможно при�оединить том дл� копии %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "Выполн�ет запу�к %s копий..."
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Выполнение завершени� работы копий"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "Тип копии %(instance_type_id)s не найден."
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Выполнение завершени� работы копий"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "От�ут�твует узел дл� копии %s, немедленное удаление"
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "Будет выполнени� попытка завершить работу %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "Попытка о�тановить %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "Попытка запу�тить %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr "Пои�к по: %s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "Запу�к �нимка дл� ВМ %s"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4220,63 +4270,63 @@ msgstr ""
 "У�таревший тип копии %(current_instance_type_name)s,  новый тип копии "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "Превышена квота дл� %(pid)s, попытка выполнить %(min_count)s копий"
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "Будет выполнени� попытка завершить работу %s"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "Группа безопа�но�ти %s не может быть пу�той."
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
@@ -4285,70 +4335,70 @@ msgstr ""
 "Значение (%s) дл� параметра GroupName недопу�тимо. Длина превышает "
 "мак�имально допу�тимое значение 255."
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "Создать группу безопа�но�ти %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr "Группа безопа�но�ти %s уже �уще�твует"
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "�евозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "�евозможно ликвидировать vbd %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "Группа безопа�но�ти (%s) не найдена"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Правило (%s) не найдено"
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "Добавление правила группы безопа�но�ти: %r"
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4413,12 +4463,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4443,256 +4493,256 @@ msgstr "КопиÑ� типа %s не найдена длÑ� выполнениÑ� Ñ
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "�евозможно переме�тить копию (%(instance_id)s) на текущий узел (%(host)s)."
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "Драйвер гипервизора не поддерживает правила брандмау�ра"
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Драйвер гипервизора не поддерживает правила брандмау�ра"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "�епредвиденный код �о�то�ни�"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "у�тановка �етевого узла"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Выполнение запу�ка копий"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "Пропу�к DiskNotFound: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "Пропу�к DiskNotFound: %s"
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr "завершение работы bdm %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "Обновление �борки %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s ра�полагает�� на общедо�тупном накопителе: %(reason)s"
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Создать �нимок из тома %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "Перезагрузка копии %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, fuzzy, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
@@ -4701,26 +4751,26 @@ msgstr ""
 "попытка перезагрузки не выполн�емой копии: %(instance_uuid)s (�о�то�ние: "
 "%(state)s ожидало�ь: %(running)s)"
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "копи� не включена"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "копи� %s: выполнение �нимка"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, fuzzy, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
@@ -4729,229 +4779,229 @@ msgstr ""
 "попытка �оздани� �нимка не выполн�емой копии: %(instance_uuid)s "
 "(�о�то�ние: %(state)s ожидало�ь: %(running)s)"
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "�айдено %(num_images)d образов (ротаци�: %(rotation)d)"
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr "Удаление образа %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "�евозможно назначить пароль админи�тратора. Копи� %s не выполн�ет��"
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 #, fuzzy
 msgid "Root password set"
 msgstr "Копи� %s: �азначение админи�тративного парол�"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "set_admin_password не реализован в �той драйвере."
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 #, fuzzy
 msgid "error setting admin password"
 msgstr "Ошибка назначени� парол� админи�тратора"
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Ошибка прио�тановлени� копии"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Копи� не �уще�твует"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr "назначение �овпадает � и�точником!"
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "копи� %s: прин�тие диагно�тики"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "Во��тановление �ети"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 #, fuzzy
 msgid "Inject network info"
 msgstr "у�тановка �етевого узла"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "Получить кон�ольный вывод дл� копии %s"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "копи� %s: получение кон�оли vnc"
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "копи� %s: получение кон�оли vnc"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "От�оединение тома от неизве�тной копии %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "Попытка удалени� не�уще�твующей кон�оли %(console_id)s."
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "�етевые ра�пределени� дл� копии %s"
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4960,21 +5010,21 @@ msgstr ""
 "от�ут�твует домен � �оответ�твующим именем.\" Эта ошибка может быть "
 "безопа�но пропущена."
 
-#: nova/compute/manager.py:3477
+#: nova/compute/manager.py:3490
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "Запущено post_live_migration().."
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Ошибка получени� метаданных дл� ip: %s"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
@@ -4983,64 +5033,64 @@ msgstr ""
 "�айдены %(migration_count)d неподтверждённых перемещений, �тарше "
 "%(confirm_window)d �екунд"
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "Завершение работы ВМ дл� копии %(instance_uuid)s"
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 #, fuzzy
 msgid "In ERROR state"
 msgstr "Ошибка БД: %s"
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr "Обновление временных данных и�пользовани� поло�ы пропу�кани�"
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Обновление временных данных и�пользовани� поло�ы пропу�кани�"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr "Обновление �о�то�ни� узла"
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -5049,86 +5099,86 @@ msgstr ""
 "�айдено %(num_db_instances)s в базе данных и %(num_vm_instances)s в "
 "гипервизоре."
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "копи� не включена"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0, пропу�к..."
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "�ет �лужбы дл� compute ID %s"
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
@@ -5250,16 +5300,35 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "Добавление кон�оли"
@@ -5341,7 +5410,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5401,7 +5470,7 @@ msgstr "�едопу�тимый запро� тела"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -6034,80 +6103,80 @@ msgstr "�едопу�тимый �етевой формат"
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "у�тановка �етевого узла"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Обнаружена ошибка: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Группа безопа�но�ти (%s) не найдена"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Удалить группу безопа�но�ти %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Обнаружена ошибка: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "Группа безопа�но�ти � правилом %(rule_id)s не найдена."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "Группа безопа�но�ти %(security_group_id)s не найдена дл� проекта "
 "%(project_id)s."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6136,7 +6205,7 @@ msgstr "�едопу�тима� server_string: %s"
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6406,11 +6475,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, fuzzy, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr "Ошибка загрузки ра�ширени� %(ext_name)s: %(exc)s"
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6850,86 +6914,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "Выполн�ет�� ли �оответ�твующа� �лужба?"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "�евозможно найти другой compute"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "%s. У�тановка �о�то�ни� копии vm_state на ERROR"
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "Попытка �обрать %(num_instances)d копию(й)"
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "Запро�: %s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "�е найден том дл� копии %(instance_id)s."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "Отфильтрованы %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "�евозможно переме�тить копию (%(instance_id)s) на текущий узел (%(host)s)."
@@ -6964,23 +7021,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr "Прин�то �лужебное обновление дл� %(service_name)s от %(host)s."
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, fuzzy, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr "Прин�то �лужебное обновление дл� %(service_name)s от %(host)s."
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "�ет �лужбы дл� compute ID %s"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
@@ -6990,10 +7047,10 @@ msgstr "Ошибка schedule_%(method)s: %(ex)s"
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "�евозможно декодировать параметры ра�пи�ани�: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
@@ -7016,7 +7073,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7295,43 +7352,45 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "Выполн�емые копии: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "По�ле завершени� работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr "Внутренн�� ошибка"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "По�ле принудительного завершени� работы копий: %s"
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 #, fuzzy
 msgid "spawn error"
 msgstr "Ошибка аутентификации"
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7462,12 +7521,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Создание файлов в %s дл� имитации го�тевого агента"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "Удаление файлов имитации го�тевого агента в %s"
@@ -7477,25 +7536,25 @@ msgstr "Удаление файлов имитации го�тевого аге
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "�евозможно загрузить драйвер виртуализации: %s"
@@ -7505,7 +7564,7 @@ msgstr "Ð�евозможно загрузить драйвер виртуалиÐ
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7560,37 +7619,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "Перечень копий"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7639,85 +7698,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "Перечень копий"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "Перечень копий"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "Создание �нимка копии ВМ %s "
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "�етевые ра�пределени� дл� копии %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "Получить кон�ольный вывод дл� копии %s"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "�етевые ра�пределени� дл� копии %s"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "�етевые ра�пределени� дл� копии %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "Получить кон�ольный вывод дл� копии %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "�евозможно найти узел дл� копии %s"
@@ -7816,12 +7875,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7831,7 +7890,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7845,22 +7904,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "разделы не найдена"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Ошибка �оздани� виртуального интерфей�а"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "разделы не найдена"
@@ -7973,12 +8028,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8234,12 +8289,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "Ошибка обновлени� агента: %(resp)r"
@@ -8268,23 +8323,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "Получить кон�ольный вывод дл� копии %s"
@@ -8298,7 +8353,7 @@ msgstr "Вер�и� агента копии: %s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8660,12 +8715,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "Перечень копий"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "�евозможно найти конфигурацию по адре�у %(path)s"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "�евозможно найти конфигурацию по адре�у %(path)s"
@@ -8831,7 +8886,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr "Создание �нимка копии ВМ %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8870,242 +8925,242 @@ msgstr "Ошибка пои�ка vbd дл� vdi %s"
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "том группы %s не �уще�твует"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "�еполадка � подключением к libvirt"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "Подключение к libvirt: %s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Выполнение о�тановки копий"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "Ошибка schedule_%(method)s: %(ex)s"
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Сети не определены."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Сети не определены."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "�нимок %s: �оздание завершено"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "Ошибка перезагрузки копии"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "Пользователь не имеет админи�тративных привилегий"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr "Создание изображени�"
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "Запро� xapi на приём образа vhd %(image)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9113,19 +9168,19 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
@@ -9134,33 +9189,33 @@ msgstr ""
 "Ошибка libvirt во врем� пои�ка %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
@@ -9169,25 +9224,25 @@ msgstr ""
 "�евозможно получить количе�тво ЦПУ, так как �та возможно�ть не "
 "реализована дл� �той платформы. Эту ошибку можно безопа�но пропу�тить."
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "у�таревша� вер�и� libvirt (не поддерживает�� getVersion)"
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "Получение размера образа дл� образа %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9195,21 +9250,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9218,29 +9273,29 @@ msgstr ""
 "Создание временного файла %s дл� оповещени� других узлов �ети compute о "
 "необходимо�ти при�оединени� того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9250,7 +9305,7 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9259,22 +9314,22 @@ msgstr ""
 "Создание временного файла %s дл� оповещени� других узлов �ети compute о "
 "необходимо�ти при�оединени� того же хранилища."
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "Ошибка аутентификации: %s"
+#: nova/virt/libvirt/driver.py:3332
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() ошибка %(cnt)d.До %(max_retry)d попыток дл� %(hostname)s."
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
@@ -9283,41 +9338,41 @@ msgstr ""
 "Ошибка libvirt во врем� пои�ка %(instance_name)s: [Код ошибки "
 "%(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "Копи� %s: выполнение"
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9338,15 +9393,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "nwfilter(%(instance_filter_name)s) дл�%(name)s не найден."
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "Брандмау�р iptables: �а�тройка базовой фильтрации"
 
@@ -9537,48 +9592,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "�епредвиденна� ошибка: %s"
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 #, fuzzy
 msgid "Failed while unplugging vif"
 msgstr "Ошибка от�оединени� vif копии '%s'"
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9586,7 +9641,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9594,7 +9649,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9602,7 +9657,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9823,7 +9878,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9973,32 +10028,32 @@ msgstr ""
 "�еобходимо указать vmwareapi_host_ip,vmwareapi_host_username и "
 "vmwareapi_host_password useconnection_type=vmwareapi"
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "маркер [%s] не найден"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "В vmwareapi:_create_session, прин�то �то и�ключение: %s"
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "В vmwareapi:_call_method, прин�то �то и�ключение: %s"
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "Со�то�ние задачи [%(task_name)s] %(task_ref)s: готово"
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "Со�то�ние задачи [%(task_name)s] %(task_ref)s: ошибка %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "В vmwareapi:_poll_task, прин�та �та ошибка %s"
@@ -10013,34 +10068,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, fuzzy, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "Свой�тво %(attr)s не назначено дл� управл�емого объекта %(objName)s"
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr "От�ут�твуют зареги�трированные ВМ"
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "Завершение �еан�а � неполадками или уже завершённого �еан�а: %s"
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr "Сеан� имеет неполадки"
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "�едопу�тимый �еан�"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " От�ут�твуют зареги�триованные виртуальные машины"
@@ -10263,12 +10318,12 @@ msgstr "Выполнение безотказной перезагрузки Ð’Ð
 msgid "Did hard reboot of VM"
 msgstr "Выполнение безотказной перезагрузки ВМ %s"
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "Выполнение перезагрузки xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "�езареги�трированна� ВМ %s"
@@ -10386,101 +10441,101 @@ msgstr "Выключение питани� ВМ %s"
 msgid "Powered on the VM"
 msgstr "Питание ВМ %s выключено"
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "Обновление выполнени� копии '%(instance_uuid)s' до %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Удалить том � идентификатором: %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "копи� - %s не пред�тавлена"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr "В vmwareapi:_create_session, прин�то �то и�ключение: %s"
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Удалить том � идентификатором: %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "Создать том из �нимка %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "�втоматиче�ка� безотказна� перезагрузка %d"
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "Создание папки � адре�ом %s"
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr "Создана папка � адре�ом %s"
@@ -10603,14 +10658,14 @@ msgstr "Ошибка пои�ка тома в базе данных"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "Точка подключени� %(mountpoint)s от�оединена от копии %(instance_name)s"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, 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:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, fuzzy, python-format
 msgid ""
 "NOT IMPLEMENTED: The call to %(method)s is not supported by the agent. "
@@ -10619,94 +10674,75 @@ msgstr ""
 "�Е РЕ�ЛИЗОВ��О: Вызов %(method)s не поддерживает�� агентом. VM "
 "id=%(instance_uuid)s; args=%(args)r"
 
-#: nova/virt/xenapi/agent.py:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "Вызов %(method)s возвратил ошибку: %(e)s."
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr "Запро� вер�ии агента"
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "Обновление агента до %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "�а�тройка парол� админи�тратора"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr "Во��тановление �ети"
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr "Сред�тва XenServer не у�тановлены в �тот образ"
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "Ошибка OpenSSL: %s"
@@ -10726,56 +10762,56 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "Ошибка дешифрировани� личного ключа: %s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr "Запу�к узла на XenServer не поддерживает��."
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 "�евозможно выполнить вход в XenAPI (недо�таточно �вободного ме�та на "
 "Dom0?)"
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "И�ключение: %s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake не имеет реализации дл� %s"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "Выполн�ет�� вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Выполн�ет�� вызов getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11708,9 +11744,3 @@ msgstr "Образ должен быть до�тупен"
 msgid "status must be 'available'"
 msgstr "Образ должен быть до�тупен"
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr "Сертификат %(certificate_id)s не найден."
-
-#~ msgid "quantum authentication failed"
-#~ msgstr "Ошибка аутентификации"
-
diff --git a/nova/locale/ru_RU/LC_MESSAGES/nova.po b/nova/locale/ru_RU/LC_MESSAGES/nova.po
index 7164fb764..e6289583d 100644
--- a/nova/locale/ru_RU/LC_MESSAGES/nova.po
+++ b/nova/locale/ru_RU/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian (Russia) "
@@ -81,298 +81,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -380,85 +380,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -466,896 +466,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1370,15 +1385,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1400,17 +1415,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1711,261 +1726,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2135,89 +2150,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2265,6 +2298,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2311,7 +2345,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2653,9 +2687,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2717,6 +2751,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2877,7 +2912,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2917,32 +2953,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2953,26 +2989,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3020,7 +3059,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3259,30 +3298,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3294,7 +3339,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3311,16 +3356,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3403,12 +3448,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3491,38 +3541,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3537,28 +3587,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3617,17 +3667,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3985,244 +4035,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4286,12 +4336,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4316,653 +4366,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5082,15 +5132,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5169,7 +5238,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5228,7 +5297,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5843,75 +5912,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5937,7 +6006,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6204,11 +6273,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6633,86 +6697,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6747,23 +6804,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6773,9 +6830,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6799,7 +6856,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7076,42 +7133,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7238,12 +7297,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7253,25 +7312,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7280,7 +7339,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7334,37 +7393,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7412,85 +7471,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7587,12 +7646,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7602,7 +7661,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7616,22 +7675,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7744,12 +7799,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8002,12 +8057,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8036,23 +8091,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8065,7 +8120,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8417,12 +8472,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8580,7 +8635,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8619,236 +8674,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8856,76 +8911,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8933,50 +8988,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8986,69 +9041,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9067,15 +9122,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9266,47 +9321,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9314,7 +9369,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9322,7 +9377,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9330,7 +9385,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9541,7 +9596,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9687,32 +9742,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9727,34 +9782,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9966,11 +10021,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10075,100 +10130,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10289,106 +10344,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10404,54 +10440,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11338,9 +11374,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/sw_KE/LC_MESSAGES/nova.po b/nova/locale/sw_KE/LC_MESSAGES/nova.po
index e39a9da44..4f0369b84 100644
--- a/nova/locale/sw_KE/LC_MESSAGES/nova.po
+++ b/nova/locale/sw_KE/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Swahili (Kenya) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/tl/LC_MESSAGES/nova.po b/nova/locale/tl/LC_MESSAGES/nova.po
index dc674ca30..9db622e16 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "walang paraan para sa mensahe: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1383,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1413,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1709,261 +1724,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2133,89 +2148,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2263,6 +2296,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2309,7 +2343,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2651,9 +2685,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2715,6 +2749,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2875,7 +2910,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2915,32 +2951,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2951,26 +2987,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3018,7 +3057,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3257,30 +3296,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3292,7 +3337,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3309,16 +3354,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3401,12 +3446,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3489,38 +3539,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3535,28 +3585,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3615,17 +3665,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/tr/LC_MESSAGES/nova.po b/nova/locale/tr/LC_MESSAGES/nova.po
index fb5e011e5..f5d64a34f 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,298 +79,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -378,85 +378,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -464,896 +464,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1368,15 +1383,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1398,17 +1413,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1709,261 +1724,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2133,89 +2148,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2263,6 +2296,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2309,7 +2343,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2651,9 +2685,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2715,6 +2749,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2875,7 +2910,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2915,32 +2951,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2951,26 +2987,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3018,7 +3057,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3257,30 +3296,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3292,7 +3337,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3309,16 +3354,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3401,12 +3446,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3489,38 +3539,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3535,28 +3585,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3615,17 +3665,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3983,244 +4033,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4284,12 +4334,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4314,653 +4364,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5080,15 +5130,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5167,7 +5236,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5226,7 +5295,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5841,75 +5910,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5935,7 +6004,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6202,11 +6271,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6631,86 +6695,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6745,23 +6802,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6771,9 +6828,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6797,7 +6854,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7074,42 +7131,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7236,12 +7295,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7251,25 +7310,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7278,7 +7337,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7332,37 +7391,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7410,85 +7469,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7585,12 +7644,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7600,7 +7659,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7614,22 +7673,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7742,12 +7797,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8000,12 +8055,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8034,23 +8089,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8063,7 +8118,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8415,12 +8470,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8578,7 +8633,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8617,236 +8672,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8854,76 +8909,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8931,50 +8986,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8984,69 +9039,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9065,15 +9120,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9264,47 +9319,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9312,7 +9367,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9320,7 +9375,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9328,7 +9383,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9539,7 +9594,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9685,32 +9740,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9725,34 +9780,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9964,11 +10019,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10073,100 +10128,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10287,106 +10342,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10402,54 +10438,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11336,9 +11372,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/tr_TR/LC_MESSAGES/nova.po b/nova/locale/tr_TR/LC_MESSAGES/nova.po
index 9d2610a81..047777852 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -81,160 +81,160 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr "Bayrakların yolu: %s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "Bilinmeyen bir istisna oluÅŸtu."
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "Özel anahtar çözümü başarısız: %s"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "Özel anahtar çözümü başarısız: %s"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "Sanal arayüz oluşturma hatası"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "Hata. Eşsiz mac adresiyle sanal arayüz oluşturmada 5 kez girişim yapıldı."
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "Yetkiniz yok."
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "Kullanıcı yönetici ayrıcalıklarına sahip değil"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "%(action)s uygulanmasına izin verilmiyor."
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "Kabul edilemez parametreler var."
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "%(volume_id)s bölümü hiçbir şeyle ilişkilendirilmedi"
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "Anahtar çifti verisi geçersiz"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "İstek geçersiz"
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "Geçersiz giriş yapıldı"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "Geçersiz bölüm"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "Geçersiz metadata"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "Geçersiz port aralığı %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "Geçersiz IP %(protocol)s."
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "Geçersiz içerik türü %(content_type)s."
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "Geçersiz CIDR %(cidr)s."
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "Hatalar: %(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
@@ -243,16 +243,16 @@ msgstr ""
 "%(aggregate_id)s üzerinde '%(action)s' eylemi gerçekleştirilemiyor. "
 "Nedeni: %(reason)s."
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
@@ -261,116 +261,116 @@ msgstr ""
 "%(attr)s %(state)s 'deki %(instance_uuid)s örneği. Örnek bu durumda iken "
 "%(method)s yapılamaz."
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "%(instance_id)s örneği çalışmıyor."
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "Şu anda servis kullanılamıyor."
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "Hesaplama servisi şu anda kullanılamıyor."
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "Desteklenen hypervisor türü geçersiz."
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "Örnek şu ankinden daha yeni hypervisor versiyonu gerektirir."
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "Desteklenen disk yolu (%(path)s) halen var,fakat var olmaması gerekir."
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "Desteklenen cihaz yolu (%(path)s) geçersiz."
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "Kabul edilemeyen CPU bilgisi"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s geçerli bir IP v4/6 adresi değildir."
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
@@ -379,7 +379,7 @@ msgstr ""
 "VLAN etiketi %(bridge)s port grubu için uygun değil. Beklenen VLAN "
 "etiketi %(tag)s'dir, fakat tek iliÅŸkili port grubu %(pgroup)s'dir."
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -390,85 +390,85 @@ msgstr ""
 "iliÅŸkilendirilmemiÅŸtir. Beklenen vSwitch %(expected)s'dir, fakat "
 "iliÅŸkilendirilen ise %(actual)s'dir."
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "%(disk_format)s disk formatı kabul edilemez."
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "%(image_id)s imajı kabul edilemez: %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "%(instance_id)s örneği kabul edilemez: %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "%(ec2_id)s Ec2 id'si kabul edilemez."
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "Geçersiz CIDR %(cidr)s."
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "Kaynak bulunamadı."
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "%(id)s ile iliÅŸkilendirilmiÅŸ bir dinamik IP yok."
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "%(volume_id)s bölümü bulunamadı."
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "%(snapshot_id)s sistem anlık görüntüsü bulunamadı."
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "%(volume_id)s bölümü için hedef id bulunamadı."
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "%(location)s'da disk yok."
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "%(driver_type)s bölümü için bir işleyici bulunamadı."
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "Geçersiz %(image_href)s imaj kaynak dosyası."
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "%(image_id)s imaj kaynak dosyası bulunamadı."
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -476,65 +476,65 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "%(project_id)s projesi bulunamadı."
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "VDI'ya okuma/yazma yapılırken SR(Saklama deposu) bulunamadı."
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "%(network_id)s ağı bulunamadı."
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "AÄŸ oluÅŸturulurken %(req)s gereklidir."
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "%(network_id)s ağı bulunamadı."
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "%(snapshot_id)s sistem anlık görüntüsü bulunamadı."
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr " %(bridge)s köprüsü için ağ bulunamadı."
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "%(uuid)s UUID'si için bir ağ bulunamadı"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "%(cidr)s CIDR ile bir ağ bulunamadı."
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
@@ -543,234 +543,234 @@ msgstr ""
 "%(network_uuid)s aÄŸ UUID verilmedi veya %(project_id)s projesi ile "
 "iliÅŸkilendirilmedi."
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "VM'nin kullandığı veri deposu referansı(ları) bulunamadı."
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "%(id)s ile iliÅŸkilendirilmiÅŸ bir dinamik IP yok."
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "%(address)s adresi için bir dinamik IP bulunamadı."
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 "%(network_id)s ağında %(host)s ağ sunucusunun hiç dinamik IP'si yok.\n"
 " "
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "(%(network_uuid)s) ağında bir (%(address)s) dinamik IP adresi yok."
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "%(address)s dinamik IP adresi geçersiz."
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "Kullanılabilir hiç dinamik IP yok."
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "Hiç dinamik IP bulunamadı."
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "%(id)s ID'si için değişken IP bulunamadı."
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "%(domain)s alanında %(name)s DNS girdisi halen var."
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "%(address)s adresi için bir değişken IP bulunamadı."
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr " %(host)s sunucusu için bir değişken IP bulunamadı."
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "Hiç mevcut değişken IP yok."
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "%(address)s deÄŸiÅŸken IP adresi iliÅŸkilendirildi."
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "%(address)s deÄŸiÅŸken IP adresi iliÅŸkilendirilemedi."
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "Hiç değişken IP yok."
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "%(interface)s arayüzü bulunamadı."
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "%(user_id)s kullanıcısı için %(name)s anahtar çifti bulunamadı"
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "%(service_id)s servisi bulunamadı."
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "%(host)s sunucusu bulunamadı."
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "%(host)s hesaplama sunucusu bulunamadı."
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "%(host)s sunucusunda %(binary)s ikilisi bulunamadı."
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "Kota bulunamadı."
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "%(project_id)s projesi için bir kota bulunamadı."
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "%(security_group_id)s güvenlik grubu bulunamadı."
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 "%(project_id)s projesi için %(security_group_id)s güvenlik grubu "
 "bulunamadı."
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
@@ -779,7 +779,7 @@ msgstr ""
 "%(security_group_id)s güvenlik grubu zaten %(instance_id)s örneği ile "
 "iliÅŸkilendirimiÅŸ."
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
@@ -788,37 +788,37 @@ msgstr ""
 "%(security_group_id)s güvenlik grubu %(instance_id)s örneği ile "
 "iliÅŸkilendirilmedi."
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "%(migration_id)s göçü bulunamadı."
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "%(status)s durumuyla %(instance_id)s örneği için göç bulunamadı."
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "%(pool_id)s konsol havuzu bulunamadı."
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
@@ -827,109 +827,109 @@ msgstr ""
 "%(host)s roxy sunucusundaki %(compute_host)s hesaplama sunucusu için "
 "%(console_type)s türünün konsol havuzu bulunamadı."
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "%(console_id)s konsolu bulunamadı."
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "Geçersiz içerik türü %(content_type)s."
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "%(instance_type_id)s örnek türü bulunamadı"
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "%(instance_type_name)s isimli örnek türü bulunamadı."
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "%(flavor_id)s örnek türü bulunamadı."
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "%(name)s örneği zaten var."
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "%(filter_name)s zamanlayıcı sunucu filtresi bulunamadı."
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
@@ -938,453 +938,468 @@ msgstr ""
 "%(instance_type_id)s örnek türü %(extra_specs_key)s anahtarı ile ekstra "
 "özelliklere sahip değil."
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "%(file_path)s dosyası bulunamadı."
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr "Hiç dosya bulunamadı."
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 "%(adapter)s ağ bağdaştırıcısı ile ilişkilendirilen sanal anahtar "
 "bulunamadı."
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "%(adapter)s ağ bağdaştırıcısı bulunamadı."
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "%(class_name)s sınıfı bulunamadı: %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "İşlem için izin verilmiyor."
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr "Önceki sistem geri görüntüsüne dönmek için izin verilmiyor."
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr "Yedek imajı geri dönüş parametresi gerekli"
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "%(key_name)s anahtar çifti zaten var."
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "%(name)s örneği zaten var."
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "Geçiş hatası."
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "Geçiş hatası."
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "Hatalı biçimlendirilmiş mesaj gövdesi: %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "%(path)s'deki yapılandırma bulunamadı"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr "Örnek türün belleği istenilen imaj dosyası için çok küçük."
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr "Örnek türünün diski istenilen imaj dosyası için çok küçük."
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "%(uuid)s hesaplama düğümü başlatmada yetersiz boş hafıza."
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "Bu sunucu için bant genişliği/cpu/disk ölçümleri alınamadı."
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "Geçerli bir sunucu bulunamadı: %(reason)s"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "Kota aşıldı"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr "Kişisel dosya limiti aşıldı"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr "Kişisel dosya yolu çok uzun"
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr "Kişisel dosya içeriği çok uzun"
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "%(aggregate_id)s kümesi bulunamadı."
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "%(aggregate_name)s kümesi zaten var."
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "%(aggregate_id)s kümesi %(host)s sunucusuna sahip değil."
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 "%(aggregate_id)s kümesi %(metadata_key)s. anahtarı ile hiç metadata'sı "
 "yok."
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "%(aggregate_id)s kümesi zaten%(host)s sunucusuna sahip."
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr "Örnek tür oluşturulamıyor."
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "%(instance_id)s örneği bulunamadı."
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "%(volume_id)s bölümü bulunamadı."
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "%(project_id)s projesi bulunamadı."
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "%(user_id)s kullanıcısı için %(name)s anahtar çifti bulunamadı"
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "%(instance_id)s örneği kurtarma modunda değil"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "%(name)s örneği zaten var."
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1399,15 +1414,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "Yetenekler zamanlayıcısı bildiriliyor ..."
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
@@ -1430,17 +1445,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1744,261 +1759,261 @@ msgstr "Bilinmeyen bir hata oluştu. Lütfen tekrar deneyin."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "Desteklenmeyen API isteği: kontrolcü = %(controller)s, işlem = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "Bölüm %s'in sistem anlık görüntüsünü oluştur"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "%s anahtar çiftini oluştur"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "%s anahtarını içeriye aktar"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "%s anahtar çiftini sil"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "Geçersiz IP %(protocol)s."
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "Belirlenmiş parametreler için hiç kural yok"
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "%s sistem görüntüsünden birim oluştur"
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "%s GB'lık birim oluştur"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "%(device)s'daki %(instance_id)s örneğine %(volume_id)s birimini bağla"
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Birimi ayır %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "Özellik desteklenmiyor: %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "birim = %s\n"
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "Adres tahsisi"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "%s adresini serbest bırak"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "%(instance_id)s örneğine %(public_ip)s adresini ilişkilendir"
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "Adresi kes %s"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "İmaj müsait olmak zorunda"
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "%r örneğini tekrar yükle"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "Örnekler durdurulacak"
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "Örnekler başlatılacak"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "%s imaj kaydı siliniyor"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "%(image_id)s id ile %(image_location)s imajı kaydedildi"
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "Kullanıcı veya grup belirlenmedi"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "Sadece \"all\" grubu destekleniyor"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "İşlem türü eklenmek veya kaldırılmak zorunda"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "%s imaj tanıtımı güncelleniyor"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "%d saniye içinde örnek durdurulamadı"
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2171,89 +2186,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "Örnek %(attr)s %(state)s'de iken '%(action)s' yapılamaz"
 
 #: nova/api/openstack/common.py:366
+#, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "Örnek '%(action)s' için geçersiz durumda"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "Sistem görüntüsü isteği reddedildi, sistem görüntüleri şu anda devre dışı."
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "Örnek sistem görüntüleri şu an onaylanmadı."
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Yüklenen bölüm: %s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr "Ext adı: %s"
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Ext takma adı: %s"
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr "Ext açıklaması: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Ext isim uzayı: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Ext güncellendi: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "İstisna yükleme uzantısı: %s"
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "Genişletme yükleniyor: %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "Genişletme fabrikası çağırılıyor %s"
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "%(ext_factory)s uzantısı yüklemede hata: %(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "%(classpath)s uzantısı yüklemede hata: %(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "%(ext_name)s uzantısı yüklemede hata: %(exc)s"
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr "JSON dosyası anlaşılamadı"
@@ -2301,6 +2334,7 @@ msgstr "Böyle bir işlem yok: %s"
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr "Kusurlu istek gövdesi"
 
@@ -2349,7 +2383,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr "alt sınıflar yapıcı() oluşturmak zorunda!"
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr "Genişletme yöneticisi başlatılıyor"
 
@@ -2700,9 +2734,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr "Geçersiz istek gövdesi"
@@ -2764,6 +2798,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2929,7 +2964,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr "Sadece kök sertifikası alınabilir."
 
@@ -2972,34 +3008,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "XVP çalışmıyor..."
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "Geçersiz metadata"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "%s güvenlik grubu zaten var"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, fuzzy, python-format
 msgid "Coverage doesn't have %s action"
 msgstr "Kümeler %s işlemine sahip değil"
@@ -3010,27 +3046,30 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s 'MANUAL' veya 'AUTO' olmak zorunda"
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "Sunucu ve blok_göçü tanımlanmak zorunda."
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "Göçte hata %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "Kural (%s) bulunamadı"
@@ -3079,7 +3118,7 @@ msgstr "%(address)s deÄŸiÅŸken IP adresi iliÅŸkilendirildi."
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr "Parametre dizini eksik"
 
@@ -3323,30 +3362,36 @@ msgid "Create networks failed"
 msgstr "Tanımlı bir ağ yok."
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3358,7 +3403,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr "Bozuk scheduler_hints özelliği"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "Geçerli bir kuralı oluşturmak için yeterli parametre yok."
 
@@ -3377,16 +3422,16 @@ msgstr "%s id'li ağ gösteriliyor"
 msgid "security group default rule not found"
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "Global ipv6 için yanlış sonek: %s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "Güvenlik grubu belirlenmedi"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "Güvenlik grup adı boş bırakılamaz"
 
@@ -3470,12 +3515,17 @@ msgstr "Yüklenen bölüm: %s"
 msgid "Ext version: %i"
 msgstr "Ext açıklaması: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "%s adresini serbest bırak"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "%s adresini serbest bırak"
@@ -3558,39 +3608,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3605,28 +3655,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
@@ -3685,17 +3735,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "eleman çocuk değil"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4064,115 +4114,115 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "%(instance_type_id)s örnek türü bulunamadı"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "Örnekleri sonlandırma işlemi başlatılıyor"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
@@ -4181,131 +4231,131 @@ msgstr ""
 "Eski örnek türü %(current_instance_type_name)s, yeni örnek türü "
 "%(new_instance_type_name)s"
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "Anahtar çifti adı 1-255 karakter arası uzunluğunda olmak zorunda"
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "%s güvenlik grubu string veya unicode değil"
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "%s güvenlik grubu boş bırakılamaz."
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "%s güvenlik grubu 255 karakterden fazla olmamalıdır."
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "%s güvenlik grubunu oluşturunuz"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr "%s güvenlik grubu zaten var"
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "Geçersiz güncelleme ayarı: '%s'"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "Kural (%s) bulunamadı"
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "Yetkilendirilmiş %s güvenlik grubu girişi"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "%s güvenlik grubu girişini iptal et"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
@@ -4369,13 +4419,13 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than or equal to 0"
-msgstr "yedekOluşturma 'dönüşme' özelliği tamsayı olmak zorunda"
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
 
 #: nova/compute/flavors.py:119
 msgid "'rxtx_factor' argument must be a positive float"
@@ -4399,577 +4449,577 @@ msgstr "Silme işlemi için %s örnek türü bulunamadı"
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "Mevcut durum %(drv_state)s, veritabanındaki durum %(db_state)s."
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "Misafir sistem sürücüsü güvenlik duvarı kurallarını desteklemiyor"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "BeklenmeyenHata: %s"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr "Durum kontrol ediliyor"
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "%s blok aygıt haritalandırması ayarlanıyor"
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr "Örnek başlatılıyor.."
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr "Ağ kurulumundaki örnek başarısız"
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "Örnek ağ_bilgisi: |%s|"
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr "Örnek blok aygıtı kurulumu hatalı"
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr "Örnek oluşturmada hata"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "Örnek için ağ serbest bırakılıyor"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s örneği"
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "DiskBulunamadı yok sayılıyor: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr "Blok cihazı haritalandırması kapatılıyor %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Birimi ayır %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, 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:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr "Ä°maj siliniyor %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, 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:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "Örnek kapatmada hata oluştu."
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "Veritabanı hatası: %s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "Örneğin hiç bölümü yok."
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr "dedef kaynak ile aynı!"
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "Konsol ekleniyor"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, 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:3055
+#: nova/compute/manager.py:3068
 #, 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:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, 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:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Bant genişliği kullanım önbelleği güncelleniyor"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr "Sunucu durumu güncelleniyor"
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
@@ -4978,84 +5028,84 @@ msgstr ""
 "Veritabanında %(num_db_instances)s ve misafir sistemde "
 "%(num_vm_instances)s bulundu"
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr "Silinen örnek kurtarılıyor"
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Ä°maj siliniyor %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5176,15 +5226,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "Konsol ekleniyor"
@@ -5265,7 +5334,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "Tekrar yükleme örneğinde hata oluştu."
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5325,7 +5394,7 @@ msgstr "%s geçerli bir örnek ismidir"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5944,80 +6013,80 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "Yakalama hatası: %s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "Güvenlik grup id'si integer olmak zorunda"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "%s güvenlik grubunu siliniz"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "Yakalama hatası: %s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "%(rule_id)s kurallı güvenlik grubu bulunamadı."
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 "%(project_id)s projesi için %(security_group_id)s güvenlik grubu "
 "bulunamadı."
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6046,7 +6115,7 @@ msgstr "Geçersiz server_string: %s"
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6313,11 +6382,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6743,86 +6807,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "Uygun servis çalışıyor mu?"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "Başka bir işlem bulunamadı"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "%(num_instances)d örnek(leri) kurulmaya çalışılıyor."
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "Geçersizİstek hatası: %s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "%(instance_id)s örneği için ağ bulunamadı."
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "%(hosts)s filtrelendi"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "%(hosts)s filtrelendi"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "Mevcut (%(host)s) sunucusundan (%(instance_id)s) örneği geçirilemez."
@@ -6857,23 +6914,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "%s işlem ID'si için servis yok"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "%(method)s zamanlaması başarısız: %(ex)s"
@@ -6883,10 +6940,10 @@ msgstr "%(method)s zamanlaması başarısız: %(ex)s"
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr "%(filename)s dosyası için zamanlayıcı seçenekleri başlatılamadı: '%(e)s'"
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "Zamanlayıcı seçenekleri çözülemedi: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
@@ -6909,7 +6966,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7189,43 +7246,45 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "Örnekler çalışıyor: %s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "Örnekleri sonlandırmanın ardından: %s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr "İçsel hata"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "Zorla öldürülen örneklerin ardından: %s"
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 #, fuzzy
 msgid "spawn error"
 msgstr "Kimlik doğrulama hatası"
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7356,12 +7415,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "Konuk aracı benzetmek için %s'de dosyalar oluşturuluyor"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "%s'deki benzetilmiş konuk aracı dosyaları kaldırılıyor"
@@ -7371,25 +7430,25 @@ msgstr "%s'deki benzetilmiş konuk aracı dosyaları kaldırılıyor"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "Sanallaştırma sürücüsü yükleme başarısız: %s"
@@ -7399,7 +7458,7 @@ msgstr "Sanallaştırma sürücüsü yükleme başarısız: %s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7453,37 +7512,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7534,85 +7593,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "|%s| örneği için değişken IP tahsisi"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "%s örneği için konsol çıktısını getir"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "%s örneği için sunucu bulma başarısız"
@@ -7710,12 +7769,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7725,7 +7784,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr "Örnekle değişken IP ilişkilendirilmedi"
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7739,23 +7798,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "Daha fazla deÄŸiÅŸken IP mevcut deÄŸil"
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "%(interface)s arayüzü bulunamadı"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "Sanal arayüz oluşturma hatası"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7868,12 +7922,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8126,12 +8180,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8160,23 +8214,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8189,7 +8243,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8543,12 +8597,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "|%s| örneği için değişken IP tahsisi"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8707,7 +8761,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8746,239 +8800,239 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "Örnekler durdurulacak"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "Tanımlı bir ağ yok."
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8986,76 +9040,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9063,21 +9117,21 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
@@ -9086,29 +9140,29 @@ msgstr ""
 "Diğer hesaplama düğümlerini haberdar etmek için %s geçici dosyası "
 "oluşturuluyor. Düğümler aynı belleğe bağlanmalıdır."
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr "Blok göçü paylaşılan hafıza ile kullanılamaz."
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9123,7 +9177,7 @@ msgstr ""
 " \n"
 " Bkz: %(u)s"
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
@@ -9132,64 +9186,64 @@ msgstr ""
 "Diğer hesaplama düğümlerini haberdar etmek için %s geçici dosyası "
 "oluşturuluyor. Düğümler aynı belleğe bağlanmalıdır."
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 "plug_vifs() %(cnt)d kez başarısız oldu. %(hostname)s için %(max_retry)d "
 "denemeye kadar tekrar deneniyor."
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
-msgstr "Birim gibi göründüğünden beri %(path)s atlanıyor"
+msgid "skipping %s since it looks like volume"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9208,15 +9262,15 @@ msgstr "Durağan filtreler koruma altına alındı"
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr "(%(instance_filter_name)s) ağ filtresi bulunamadı."
+msgid "The nwfilter(%s) is not found."
+msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "%(name)s için (%(instance_filter_name)s) ağ filtresi bulunamadı."
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptabloları güvenlik duvarı: Temel Filtreleme Kurulumu"
 
@@ -9409,47 +9463,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "Beklenen nesne türü: %s"
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "%(vlan)s vlan ve %(bridge)s köprüsü koruma altına alınıyor"
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "%s köprüsü koruma altına alınıyor"
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9457,7 +9511,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9465,7 +9519,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9473,7 +9527,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9685,7 +9739,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9831,32 +9885,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr " [%s] göstergesi bulunamadı"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9871,34 +9925,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -10110,11 +10164,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10219,100 +10273,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "%s sistem görüntüsünden birim oluştur"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "%s sistem görüntüsünden birim oluştur"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10435,106 +10489,87 @@ msgstr "Geçersiz bölüm"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10550,54 +10585,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11492,9 +11527,3 @@ msgstr "İmaj müsait olmak zorunda"
 msgid "status must be 'available'"
 msgstr "İmaj müsait olmak zorunda"
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr "%(certificate_id)s sertifikası bulunamadı"
-
-#~ msgid "quantum authentication failed"
-#~ msgstr "Kimlik doğrulama hatası"
-
diff --git a/nova/locale/uk/LC_MESSAGES/nova.po b/nova/locale/uk/LC_MESSAGES/nova.po
index 6095be0c7..977bbbc92 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "без пор�дку дл� повідомлень: %s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1711,262 +1726,262 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "Це правило вже і�нує в групі %s"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "Створити розділ на %s ГБ"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "Від'єднати том %s"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "лише група \"в�і\" підтримуєть��"
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2136,89 +2151,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2266,6 +2299,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2312,7 +2346,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2654,9 +2688,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2718,6 +2752,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2878,7 +2913,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2918,32 +2954,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2954,26 +2990,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3021,7 +3060,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3260,30 +3299,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3295,7 +3340,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3313,16 +3358,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3405,12 +3450,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3493,38 +3543,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3539,28 +3589,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3619,17 +3669,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3988,244 +4038,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4289,12 +4339,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4319,654 +4369,654 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "Від'єднати том %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5086,15 +5136,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5173,7 +5242,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5232,7 +5301,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5847,76 +5916,76 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "Вилучити групу безпеки %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5942,7 +6011,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6209,11 +6278,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6638,86 +6702,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6752,23 +6809,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6778,9 +6835,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6804,7 +6861,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7081,42 +7138,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7243,12 +7302,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7258,25 +7317,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7285,7 +7344,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7339,37 +7398,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7417,85 +7476,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7592,12 +7651,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7607,7 +7666,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7621,22 +7680,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7749,12 +7804,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8007,12 +8062,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8041,23 +8096,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8070,7 +8125,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8422,12 +8477,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8585,7 +8640,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8624,236 +8679,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8861,76 +8916,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8938,50 +8993,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8991,69 +9046,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9072,15 +9127,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9271,47 +9326,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9319,7 +9374,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9327,7 +9382,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9335,7 +9390,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9546,7 +9601,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9692,32 +9747,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9732,34 +9787,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9971,11 +10026,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10080,100 +10135,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "Від'єднати том %s"
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "Від'єднати том %s"
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10294,106 +10349,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10409,54 +10445,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "Оголошенн� черги %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11344,9 +11380,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/vi_VN/LC_MESSAGES/nova.po b/nova/locale/vi_VN/LC_MESSAGES/nova.po
index f5eec9a87..2e5039173 100644
--- a/nova/locale/vi_VN/LC_MESSAGES/nova.po
+++ b/nova/locale/vi_VN/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-13 19:22+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/zh_CN/LC_MESSAGES/nova.po b/nova/locale/zh_CN/LC_MESSAGES/nova.po
index 55d5c6e95..a149afb73 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -81,302 +81,302 @@ msgstr "�新�动实例失败"
 msgid "Flags path: %s"
 msgstr "标记所在路径：%s"
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "�生未知异常。"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "解密文本失败"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "解密文本失败"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "虚拟接�创建失败"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "用唯一mac地�5次�试创建虚拟接�失败"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "未授�。"
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "用户没有管�员��"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "政策��许 %(action)s 被执行。"
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, fuzzy, python-format
 msgid "Image %(image_id)s is not active."
 msgstr "镜� %(image_id)s 没有找到。"
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, fuzzy, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr "没有为镜� %(image_id)s 找到内核。"
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "无法接�的�数。"
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 #, fuzzy
 msgid "Block Device Mapping is Invalid."
 msgstr "block_device_mapping %s"
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr "� %(volume_id)s 没有附加任何东西"
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "密钥对数�无效"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr "请求无效。"
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr "收到无效的输入"
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr "无效的�"
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr "无效的元数�"
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 #, fuzzy
 msgid "Invalid metadata size"
 msgstr "无效的元数�键"
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr "无效的端�范围 %(from_port)s:%(to_port)s. %(msg)s"
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr "无效的IP�议 %(protocol)s。"
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr "无效的内容类型 %(content_type)s。"
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr "无效的cidr %(cidr)s。"
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr "%(err)s"
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr "无法执行action '%(action)s' 于�� %(aggregate_id)s 上。原因： %(reason)s。"
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, fuzzy, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr "找�到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr "实例 %(instance_uuid)s 处于%(attr)s %(state)s 中。该实例在这�状�下�能执行 %(method)s。"
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr "实例 %(instance_id)s 没有�行。"
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr "实例 %(instance_id)s �在救�模�。"
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr "实例 %(instance_id)s �在救�模�。"
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, fuzzy, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr "实例 %(instance_id)s 没有挂起。"
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr "挂起实例失败"
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "注入文件失败：%(resp)r"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, fuzzy, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr "设置管�员密�失败。实例 %s 没有�行"
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, fuzzy, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr "设置管�员密�失败。实例 %s 没有�行"
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr "�新�动实例失败"
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 #, fuzzy
 msgid "Failed to terminate instance"
 msgstr "�新�动实例失败"
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "�新�动实例失败"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr "此时的付��用。"
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, fuzzy, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr "此时的计算�务��用。"
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr "无法把实例 (%(instance_id)s) �移到当�主机 (%(host)s)。"
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr "�供的虚拟机管�程�类型无效。"
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr "该实例需�比当�版本更新的虚拟机管�程�。"
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr "�供的�盘路径 (%(path)s) 已�存在，预计是�存在的。"
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr "�供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, fuzzy, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr "�供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, fuzzy, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr "�供的设备路径 (%(path)s) 是无效的。"
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr "无法接�的CPU信�"
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr "%(address)s �是有效的IP v4/6地�。"
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr "VLAN标签对于端�组%(bridge)s 是�适�的。预计的VLAN标签是 %(tag)s，但与端�组关�的是 %(pgroup)s。"
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -386,86 +386,86 @@ msgstr ""
 "包�端�组 %(bridge)s 的vSwitch没有与预计的物�适�器关�。预计的vSwitch是 %(expected)s，但关�的是 "
 "%(actual)s。"
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr "�盘格� %(disk_format)s �能接�"
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr "镜� %(image_id)s 无法接�，原因是： %(reason)s"
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr "实例 %(instance_id)s 无法接�，原因是： %(reason)s"
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr "Ec2 id %(ec2_id)s 无法接�。"
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, fuzzy, python-format
 msgid "Invalid ID received %(id)s."
 msgstr "无效的cidr %(cidr)s。"
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 #, fuzzy
 msgid "Constraint not met."
 msgstr "实例 - %s �存在"
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr "资�没有找到。"
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, fuzzy, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关�。"
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr "� %(volume_id)s 没有找到。"
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr "没有为� %(volume_id)s 找到目标id。"
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr "在 %(location)s 没有�盘"
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr "无法为 %(driver_type)s �找到�柄。"
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr "无效的镜�href %(image_href)s。"
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr "镜� %(image_id)s 没有找到。"
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -473,905 +473,920 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr "没有找到存储库�读写VDI。"
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, fuzzy, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, fuzzy, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr "创建网络 %(req)s  是必�的。"
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, fuzzy, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr "无法为桥 %(bridge)s 找到网络"
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr "无法为uuid %(uuid)s 找到网络"
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr "无法为cidr %(cidr)s 找到网络。"
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr "没有网络定义。"
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr "或者网络uuid %(network_uuid)s�存在，或者它没有分�给项目 %(project_id)s。"
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr "无法找到虚拟机使用的数�存储引用。"
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, fuzzy, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr "网络 %(network_id)s 没有找到。"
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, fuzzy, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr "无法为实例 %(instance_id)s 找到网络。"
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr "没有固定IP与id %(id)s 关�。"
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr "没有为地� %(address)s 找到固定IP。"
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr "实例 %(instance_id)s 没有固定ip。"
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr "网络主机 %(host)s 在网络 %(network_id)s 中没有固定ip。"
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr "实例 %(instance_id)s 没有固定ip '%(ip)s'。"
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr "固定IP地� (%(address)s) 在网络 (%(network_uuid)s) 中�存在。"
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, fuzzy, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr "固定IP地� %(address)s 已在使用。"
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr "固定IP地� %(address)s 无效。"
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr "没有固定ip�用。"
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr "找�到固定IP。"
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, fuzzy, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr "浮动ip %(address)s 已被关�。"
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr "找�到适�id %(id)s 的浮动IP。"
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr "DNS 入� %(name)s 已�在域中 %(domain)s 存在。"
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr "找�到适�地� %(address)s 的浮动ip。"
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, fuzzy, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr "找�到适�地� %(address)s 的浮动ip。"
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 #, fuzzy
 msgid "Floating ip pool not found."
 msgstr "没有找到floating_ip"
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr "没有浮动IP�用。"
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr "浮动ip %(address)s 已被关�。"
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr "浮动ip %(address)s 没有被关�。"
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr "没有浮动ip存在。"
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr "接� %(interface)s没有找到。"
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr "�务 %(service_id)s 没有找到。"
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr "主机 %(host)s 没有找到。"
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr "计算主机 %(host)s 没有找到。"
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr "没有找到二进制 %(binary)s 在主机 %(host)s 上。"
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr "��没有找到。"
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到��。"
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, fuzzy, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr "找�到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, fuzzy, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr "没有为项目 %(project_id)s 找到��。"
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, fuzzy, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr "用户 %(user_id)s 没有找到。"
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, fuzzy, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "扩展资�：%s"
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr "安全组 %(security_group_id)s 没有找到。"
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr "没有找到安全组 %(security_group_id)s 针对项目 %(project_id)s 。"
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr "安全组 %(security_group_id)s 已�与实例 %(instance_id)s 关�。"
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr "安全组 %(security_group_id)s 没有与实例 %(instance_id)s 关�。"
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, fuzzy, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr "�移 %(migration_id)s 没有找到。"
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr "没有为实例 %(instance_id)s 找到�移其状�为 %(status)s 。"
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr "控制�池 %(pool_id)s 没有找到。"
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr "没有找到类型是 %(console_type)s 的控制�池针对计算主机 %(compute_host)s 在代�主机 %(host)s 上。"
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr "控制�%(console_id)s 没有找到。"
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, fuzzy, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制�。"
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, fuzzy, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr "没有为实例 %(instance_id)s 在池 %(pool_id)s 中找到控制�。"
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, fuzzy, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr "无效的控制�类型 %(console_type)s "
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr "�为 %(instance_type_name)s 的实例类型没有找到。"
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr "类型 %(flavor_id)s 没有找到。"
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, fuzzy, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr "�组 %s �存在"
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 #, fuzzy
 msgid "Timeout waiting for response from cell"
 msgstr "等待RPC�应超时：%s"
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, fuzzy, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr "没有为实例 %(instance_id)s 找到�。"
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr "调度器主机过滤器 %(filter_name)s 没有找到。"
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数�。"
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, fuzzy, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr "实例 %(instance_id)s 没有键为 %(metadata_key)s 的元数�。"
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr "实例类型 %(instance_type_id)s 没有�外的 键为%(extra_specs_key)s 的规格说明。"
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr "找�到文件 %(file_path)s。"
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr "没找到文件"
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr "未找到与网络适�器 %(adapter)s 关�的虚拟交�机。"
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr "未找到网络适�器 %(adapter)s。"
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr "找�到类 %(class_name)s ：异常 %(exception)s"
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr "�作��许。"
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr "快照��许循环。"
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr "备份 image_type �求循环�数。"
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, fuzzy, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr "密钥对 %(key_name)s 已�存在。"
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr "实例 %(name)s 已�存在。"
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, fuzzy, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr "实例类型 %(name)s 已�存在。"
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, fuzzy, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr "实例类型 %(name)s 已�存在。"
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, fuzzy, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, fuzzy, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr "�移错误"
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 #, fuzzy
 msgid "Migration pre-check error"
 msgstr "�移错误"
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr "错误格�的消�体： %(reason)s"
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr "在 %(path)s 找�到�置文件。"
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr "无法从路径 %(path)s 中加载应用 '%(name)s'"
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 #, fuzzy
 msgid "When resizing, instances must change flavor!"
 msgstr "调整时实例的大�必须��生�化。"
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr "实例类型的内存对于所请求的镜�太�。"
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr "实例类型的�盘对于所请求的镜�太�。"
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr "没有足够的�用内存��动计算节点  %(uuid)s。"
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr "无法获�此主机的带宽�CPU和�盘指标。"
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr "找�到有效主机，原因是 %(reason)s。"
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr "超出��"
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, fuzzy, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr "%(pid)s 已�超过��，试图�行 %(min_count)s 个实例"
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 #, fuzzy
 msgid "Maximum number of floating ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 #, fuzzy
 msgid "Maximum number of fixed ips exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, fuzzy, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr "超过个性化文件�制"
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr "个性化文件路径太长"
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr "个性化文件内容太长"
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 #, fuzzy
 msgid "Maximum number of key pairs exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 #, fuzzy
 msgid "Maximum number of security groups or rules exceeded"
 msgstr "所选择主机的最大数目(%d)"
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, fuzzy, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr "�� %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr "找�到�� %(aggregate_id)s。"
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr "�� %(aggregate_name)s 已�存在。"
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr "�� %(aggregate_id)s没有主机 %(host)s。"
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr "�� %(aggregate_id)s 没有键为 %(metadata_key)s 的元数�。"
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr "�� %(aggregate_id)s已�有主机 %(host)s。"
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr "无法创建实例类型。"
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, fuzzy, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr "设置管�员密�失败。实例 %s 没有�行"
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, fuzzy, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr "检测到已存在的id为%(vlan) vlan"
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr "实例 %(instance_id)s 没有找到。"
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, fuzzy, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr "没有为实例 %(instance_id)s 找到控制�。"
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, fuzzy, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr "� %(volume_id)s 没有找到。"
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, fuzzy, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr "快照 %(snapshot_id)s 没有找到。"
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, fuzzy, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr "镜� %(image_id)s 没有找到。"
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, fuzzy, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr "获�镜� %(image)s"
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, fuzzy, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr "获�镜� %(image)s"
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, fuzzy, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr "没有为主机 %(host)s 找到浮动IP。"
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, fuzzy, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr "没有找到实例 %(instance_id)s"
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, fuzzy, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr "释放实例的网络"
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, fuzzy, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr "把� %(volume_id)s 附加到实例 %(instance_id)s 上�置在 %(device)s"
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, fuzzy, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr "密钥对 %(name)s 没有为用户 %(user_id)s 找到。"
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, fuzzy, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr "没有为项目 %(project_id)s 找到��。"
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, fuzzy, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr "项目 %(project_id)s 没有找到。"
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 #, fuzzy
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "实例 %(instance_id)s �在救�模�。"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "实例 %(instance_id)s �在救�模�。"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, fuzzy, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr "实例类型 %(name)s 已�存在。"
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, fuzzy, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr "期望的对象类型：%s"
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1386,15 +1401,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr "�调度器通报能力。"
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 #, fuzzy
 msgid "Failed to get nw_info"
 msgstr "为ip： %s获�元数�失败"
@@ -1417,17 +1432,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1729,274 +1744,274 @@ msgstr "�生了一个未知的错误. 请�试你的请求."
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr "�支�的API请求：controller = %(controller)s，action = %(action)s"
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr "创建� %s 的快照"
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, fuzzy, python-format
 msgid "Could not find key pair(s): %s"
 msgstr "解密�钥失败：%s"
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr "创建密钥对 %s"
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr "导入密钥 %s"
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr "删除密钥对 %s"
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, fuzzy, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr "�数�够创建有效规则。"
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, fuzzy, python-format
 msgid "Invalid IP protocol %s."
 msgstr "无效的IP�议 %(protocol)s。"
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr "对给定的�数无特定规则。"
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, fuzzy, python-format
 msgid "%s - This rule already exists in group"
 msgstr "这�规则已�存在于组%s 中"
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr "获�实例 %s 控制�输出"
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr "从快照 %s 创建�"
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr "创建 %s GB的�"
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 #, fuzzy
 msgid "Delete Failed"
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr "把� %(volume_id)s 附加到实例 %(instance_id)s 上�置在 %(device)s"
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 #, fuzzy
 msgid "Attach Failed."
 msgstr "创建失败"
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr "分离� %s"
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 #, fuzzy
 msgid "Detach Volume Failed."
 msgstr "分离� %s"
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr "属性�支�: %s"
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr "vol = %s\n"
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr "分�地�"
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 #, fuzzy
 msgid "No more floating IPs available"
 msgstr "没有更多的浮动ip。"
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr "释放地� %s"
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 #, fuzzy
 msgid "Unable to release IP Address."
 msgstr "无法找到地� %r"
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr "把地� %(public_ip)s 关�到实例 %(instance_id)s"
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 #, fuzzy
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr "无法找到地� %r"
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, fuzzy, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr "存在多个固定IP，使用第一个：%s"
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 #, fuzzy
 msgid "Floating ip is already associated."
 msgstr "浮动ip %(address)s 已被关�。"
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 #, fuzzy
 msgid "l3driver call to add floating ip failed."
 msgstr "没有浮动IP�用。"
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 #, fuzzy
 msgid "Error, unable to associate floating ip."
 msgstr "无法找到地� %r"
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr "�消地� %s 的关�"
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 #, fuzzy
 msgid "Floating ip is not associated."
 msgstr "浮动ip %(address)s 没有被关�。"
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr "镜�必须�用。"
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr "准备开始终止实例"
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr "��实例 %r"
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr "准备�止实例"
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr "准备�动实例"
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr "解除镜� %s 的注册"
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr "用id %(image_id)s 注册镜� %(image_location)s"
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr "用户或者组没有确定"
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr "仅仅支�组\"all\""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr "operation_type必须添加或者移除"
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr "正在更新镜� %s 的 publicity 属性"
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr "无法在 %d 秒内�止实例"
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 #, fuzzy
 msgid "Expecting a list of resources"
 msgstr "获�实例列表"
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 #, fuzzy
 msgid "Only instances implemented"
 msgstr "实例 - %s �存在"
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 #, fuzzy
 msgid "Expecting a list of tagSets"
 msgstr "获�实例列表"
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 #, fuzzy
 msgid "Invalid CIDR"
 msgstr "无效的"
@@ -2170,89 +2185,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr "无效的元数�"
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr "'%(action)s' 针对处于 %(attr)s %(state)s 的实例是无法进行"
 
 #: nova/api/openstack/common.py:366
+#, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
 #, fuzzy, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr "实例针对 '%(action)s' 处于无效状�"
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr "拒�快照请求，快照当�未被激活"
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr "该时刻实例快照是��许的。"
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "加载的扩展：%s"
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr "Ext name: %s"
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Ext alias: %s"
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr "Ext �述: %s"
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Ext 命�空间: %s"
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Ext updated: %s"
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "加载扩展�生异常：%s"
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr "正在加载扩展 %s"
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr "调用扩展工厂 %s"
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr "加载扩展 %(ext_factory)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, fuzzy, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr "加载扩展 %(ext_name)s 失败：%(exc)s"
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr "无法�解JSON"
@@ -2300,6 +2333,7 @@ msgstr "没有该动作：%s"
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr "错误格�的请求主体"
 
@@ -2346,7 +2380,7 @@ msgstr "模�数�匹�；把slave %(slavetag)s 添加到master %(mastertag)s
 msgid "subclasses must implement construct()!"
 msgstr "subclasses必须执行construct()!"
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr "正在�始化扩展管�员。"
 
@@ -2700,9 +2734,9 @@ msgstr "调整大�请求�求有属性'flavorRef'。"
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr "无效的请求主体"
@@ -2764,6 +2798,7 @@ msgstr "Compute.api::reset_network %s"
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr "没有找到�务器"
 
@@ -2931,7 +2966,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr "�有根�书能被获�。"
 
@@ -2973,34 +3009,34 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 #, fuzzy
 msgid "Coverage not running"
 msgstr "xvp�在�行中"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "无效的快照"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, fuzzy, python-format
 msgid "Directory conflict: %s already exists"
 msgstr "安全组 %s 已�存在"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, fuzzy, python-format
 msgid "Coverage doesn't have %s action"
 msgstr "网络�包�动作 %s"
@@ -3011,27 +3047,30 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr "%s 必须是'MANUAL' 或者 'AUTO'。"
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 #, fuzzy
 msgid "host and onSharedStorage must be specified."
 msgstr "host与block_migration必须确定"
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, fuzzy, python-format
 msgid "Error in evacuate, %s"
 msgstr "�移错误 %s"
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, fuzzy, python-format
 msgid "Fixed IP %s not found"
 msgstr "�书 %(certificate_id)s 没有找到。"
@@ -3082,7 +3121,7 @@ msgstr "浮动ip %(address)s 没有被关�。"
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr "缺少�数 dict"
 
@@ -3333,30 +3372,36 @@ msgid "Create networks failed"
 msgstr "创建失败"
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3368,7 +3413,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr "错误格�的 scheduler_hints 属性"
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr "�数�够创建有效规则。"
 
@@ -3387,16 +3432,16 @@ msgstr "显示id是 %s 的网络"
 msgid "security group default rule not found"
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, fuzzy, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr "错误的to_global_ipv6�缀：%s"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr "没有指定安全组"
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr "安全组�称�能是空"
 
@@ -3482,12 +3527,17 @@ msgstr "加载的扩展：%s"
 msgid "Ext version: %i"
 msgstr "Ext �述: %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, fuzzy, python-format
 msgid "Reserving IP address %s"
 msgstr "释放地� %s"
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, fuzzy, python-format
 msgid "Unreserving IP address %s"
 msgstr "释放地� %s"
@@ -3570,39 +3620,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "没有为实例 %(instance_id)s 找到�。"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "没有为实例 %(instance_id)s 找到�。"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3617,28 +3667,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, fuzzy, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr "没有为实例 %(instance_id)s 找到�。"
@@ -3697,17 +3747,17 @@ msgstr "�动VPN %s"
 msgid "Failed to load %s"
 msgstr "无法创建�"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, fuzzy, python-format
 msgid "deployment to node %s failed"
 msgstr "元素�是�节点"
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -4081,256 +4131,256 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 #, fuzzy
 msgid "Cannot run any more instances of this type."
 msgstr "超过实例的��。您无法�行更多此类型的实例。"
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, fuzzy, python-format
 msgid "Can only run %s more instances of this type."
 msgstr "超过实例的��。您�能��行 %s 个此类型的实例。"
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, fuzzy, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr "%(pid)s 已�超过��，试图�行 %(min_count)s 个实例"
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr "%(pid)s 已�超过��，试图设置 %(num_metadata)s 个元数�属性"
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 #, fuzzy
 msgid "Metadata property key greater than 255 characters"
 msgstr "安全组 %s �能比255个字符更长。"
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 #, fuzzy
 msgid "Metadata property value greater than 255 characters"
 msgstr "安全组 %s �能比255个字符更长。"
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "无法附加�到实例 %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr "准备�行 %s 个实例"
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr "bdm %s"
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr "block_device_mapping %s"
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, fuzzy, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr "实例类型 %(instance_type_id)s 没有找到。"
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 #, fuzzy
 msgid "going to delete a resizing instance"
 msgstr "准备开始终止实例"
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, fuzzy, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr "没有托管实例 %s，立刻删除"
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 #, fuzzy
 msgid "Going to try to soft delete instance"
 msgstr "准备�试软删除实例 %s"
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 #, fuzzy
 msgid "Going to try to terminate instance"
 msgstr "准备�试终止实例 %s"
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 #, fuzzy
 msgid "Going to try to stop instance"
 msgstr "准备�试�止实例 %s"
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 #, fuzzy
 msgid "Going to try to start instance"
 msgstr "准备�试�动实例 %s"
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr "�索�件： %s"
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, fuzzy, python-format
 msgid "snapshot for %s"
 msgstr "开始为虚拟机 %s 快照"
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr "flavor_id为空。�定在�移。"
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr "旧的实例类型 %(current_instance_type_name)s，新的实例类型 %(new_instance_type_name)s"
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, fuzzy, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr "%(pid)s 已�超过��，试图�行 %(min_count)s 个实例"
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, fuzzy, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr "准备�试终止实例 %s"
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr "密钥对�称长度必须在1到255个字符之间"
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr "安全组 %s 既�是字符串也�是unicode"
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr "安全组 %s �能为空。"
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, fuzzy, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr "�数GroupName的值 (%s) 无效。长度超过了上�255。"
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr "安全组 %s �能比255个字符更长。"
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr "创建安全组 %s"
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr "安全组 %s 已�存在"
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "无法销�VBD %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "无法销�VBD %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 #, fuzzy
 msgid "Security group is still in use"
 msgstr "安全组id应该是整数"
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr "没有找到规则 (%s)"
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 #, fuzzy
 msgid "Quota exceeded, too many security group rules."
 msgstr "添加安全组规则：%r"
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr "授� %s 安全组入���"
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr "撤销 %s 安全组入���"
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr "安全组id应该是整数"
 
@@ -4395,13 +4445,13 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
-#, fuzzy, python-format
-msgid "'%s' argument must be greater than or equal to 0"
-msgstr "createBackup的属性 'rotation'必须是整数"
+#, python-format
+msgid "'%s' argument must be an integer greater than or equal to 0"
+msgstr ""
 
 #: nova/compute/flavors.py:119
 #, fuzzy
@@ -4426,514 +4476,514 @@ msgstr "未找到�删除的实例类型 %s"
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, fuzzy, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr "无法把实例 (%(instance_id)s) �移到当�主机 (%(host)s)。"
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 #, fuzzy
 msgid "Failed to check if instance shared"
 msgstr "�新�动实例失败"
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr "当�状�是 %(drv_state)s，数�库状�是 %(db_state)s。"
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr "nova-compute���，实例正在��。"
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 #, fuzzy
 msgid "Hypervisor driver does not support resume guests"
 msgstr "虚拟机管�程�驱动�支�防�墙规则"
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr "虚拟机管�程�驱动�支�防�墙规则"
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, fuzzy, python-format
 msgid "Unexpected power state %d"
 msgstr "�外的状��"
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr "正在检查状�"
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr "正在设置 bdm %s"
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 #, fuzzy
 msgid "Failed to dealloc network for deleted instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 #, fuzzy
 msgid "Instance was deleted during spawn."
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, fuzzy, python-format
 msgid "Error: %s"
 msgstr "数�库错误：%s"
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr "正在�动虚拟机"
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 #, fuzzy
 msgid "Allocating IP information in the background."
 msgstr "没有找到floating_ip"
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr "实例网络设置失败"
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr "实例的network_info：|%s|"
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr "实例�设备设置失败"
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr "实例生产失败"
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 #, fuzzy
 msgid "Failed to deallocate network for instance."
 msgstr "释放实例的网络"
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr "%(action_str)s 实例"
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, fuzzy, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr "忽略异常 DiskNotFound: %s"
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr "终止bdm %s"
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr "%s。把实例的 vm_state设置为ERROR"
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 #, fuzzy
 msgid "Rebuilding instance"
 msgstr "正在�新创建实例 %s"
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, fuzzy, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr "%(path)s 在共享存储上：%(reason)s"
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "为� %s 创建快照"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 #, fuzzy
 msgid "Rebooting instance"
 msgstr "正在��虚拟机 %s"
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, 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:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 #, fuzzy
 msgid "Instance disappeared during reboot"
 msgstr "实例 %s：��"
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 #, fuzzy
 msgid "instance snapshotting"
 msgstr "实例 %s: 快照中"
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, 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:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr "找到 %(num_images)d 个镜� (rotation: %(rotation)d)"
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr "轮�出%d个备份"
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr "正在删除镜� %s"
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr "设置管�员密�失败。实例 %s 没有�行"
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 #, fuzzy
 msgid "Root password set"
 msgstr "实例 %s：Root密�已设置"
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 #, fuzzy
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, fuzzy, python-format
 msgid "set_admin_password failed: %s"
 msgstr "该驱动�能执行set_admin_password。"
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 #, fuzzy
 msgid "error setting admin password"
 msgstr "设置管�员密�出错"
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "挂起实例失败"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, fuzzy, python-format
 msgid "Driver Error: %s"
 msgstr "数�库错误：%s"
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 #, fuzzy
 msgid "Unrescuing"
 msgstr "实例 %s：�消救�"
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, fuzzy, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状�"
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 #, fuzzy
 msgid "Instance has no source host"
 msgstr "实例没有�。"
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr "目标与��一样。"
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 #, fuzzy
 msgid "Pausing"
 msgstr "正在更新。"
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 #, fuzzy
 msgid "Retrieving diagnostics"
 msgstr "实例 %s ：获�诊断"
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 #, fuzzy
 msgid "Reset network"
 msgstr "�置网络"
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 #, fuzzy
 msgid "Inject network info"
 msgstr "实例 %s：注入网络信�"
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr "将注入的network_info：|%s|"
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 #, fuzzy
 msgid "Get console output"
 msgstr "获�实例 %s 控制�输出"
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 #, fuzzy
 msgid "Getting vnc console"
 msgstr "实例 %s：正在获得VNC控制�"
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 #, fuzzy
 msgid "Getting spice console"
 msgstr "实例 %s：正在获得VNC控制�"
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr "� %(volume_id)s 正在 %(mountpoint)s 上�动"
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, 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:3081
+#: nova/compute/manager.py:3094
 #, fuzzy, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr "� %(volume_id)s 从挂载点 %(mp)s 分离"
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "从未知实例%s中分离�"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, fuzzy, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr "正在把� %(volume_id)s 附加到 %(mountpoint)s"
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, fuzzy, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr "实例 %s 的网络分�"
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 #, fuzzy
 msgid "_post_live_migration() is started.."
 msgstr "post_live_migration()已��动。"
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 msgid ""
 "You may see the error \"libvirt: QEMU error: Domain not found: no domain "
 "with matching name.\" This error can be safely ignored."
@@ -4941,171 +4991,171 @@ msgstr ""
 "你会看到错误“libvirt: QEMU error: Domain not found: no domain with matching "
 "name。�这个错误�以放心的忽略。"
 
-#: nova/compute/manager.py:3477
+#: nova/compute/manager.py:3490
 #, fuzzy
 msgid "Post operation of migration started"
 msgstr "�移��作�动"
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, fuzzy, python-format
 msgid "Failed to get compute_info for %s"
 msgstr "为ip： %s获�元数�失败"
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, 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:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, fuzzy, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr "为实例 %(instance_uuid)s 关闭虚拟机"
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 #, fuzzy
 msgid "In ERROR state"
 msgstr "节点处于未知的错误状�。"
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 #, fuzzy
 msgid "Updating volume usage cache"
 msgstr "更新带宽使用缓存"
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr "更新主机状�"
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, 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:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 #, fuzzy
 msgid "Instance is not (soft-)deleted."
 msgstr "实例未�动"
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 #, fuzzy
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr "FLAGS.reclaim_instance_interval <= 0，跳过..."
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr "回收删除的实例"
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, fuzzy, python-format
 msgid "Deleting orphan compute node %s"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, fuzzy, python-format
 msgid "No service record for host %s"
 msgstr "计算节点 %s 没有�务"
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, fuzzy, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr "设置实例 %(instance_uuid)s 至 ERROR 状�"
@@ -5227,16 +5277,35 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 #, fuzzy
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr "block_device_mapping %s"
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, fuzzy, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr "无法�移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr "正在添加控制�"
@@ -5318,7 +5387,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr "�新�动实例失败"
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5378,7 +5447,7 @@ msgstr "实例 %s：已救�"
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -6004,78 +6073,78 @@ msgstr "错误的网络格�"
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr "找�到适�id %(id)s 的浮动IP。"
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, fuzzy, python-format
 msgid "Quantum Error creating security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, fuzzy, python-format
 msgid "Quantum Error updating security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, fuzzy, python-format
 msgid "Quantum security group %s not found"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, fuzzy, python-format
 msgid "Quantum Error: %s"
 msgstr "抓到错误：%s"
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 #, fuzzy
 msgid "Quantum Error getting security groups"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 #, fuzzy
 msgid "Security group id should be uuid"
 msgstr "安全组id应该是整数"
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, fuzzy, python-format
 msgid "Quantum Error getting security group %s"
 msgstr "删除安全组 %s"
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 #, fuzzy
 msgid "Quantum Error:"
 msgstr "抓到错误：%s"
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, fuzzy, python-format
 msgid "Quantum security group rule %s not found"
 msgstr "带有规则 %(rule_id)s 的安全组没有找到。"
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, fuzzy, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr "没有找到安全组 %(security_group_id)s 针对项目 %(project_id)s 。"
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, fuzzy, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -6102,7 +6171,7 @@ msgstr "�正确的server_string：%s"
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6372,11 +6441,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, fuzzy, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr "加载扩展 %(classpath)s 失败：%(exc)s"
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6814,86 +6878,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr "正确的�务在�行�？"
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr "无法找到�一个计算节点"
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
-#, fuzzy, python-format
-msgid "Setting instance to %(state)s state."
-msgstr "设置实例 %(instance_uuid)s 至 ERROR 状�"
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
+#, python-format
+msgid "Setting instance to %s state."
+msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, fuzzy, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr "无法�移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, fuzzy, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr "�试创建 %(num_instances)d 个实例"
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, fuzzy, python-format
 msgid "Request Spec: %s"
 msgstr "请求：%s"
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "没有为实例 %(instance_id)s 找到�。"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr "过滤掉的主机 %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, fuzzy, python-format
 msgid "Weighed %(hosts)s"
 msgstr "过滤掉的主机 %(hosts)s"
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, fuzzy, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr "无法�移 %(instance_id)s 到 %(dest)s 上：缺少内存(主机：%(avail)s <= 实例：%(mem_inst)s)"
@@ -6928,23 +6985,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr "接收到 %(service_name)s �务更新，�自 %(host)s。"
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, fuzzy, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr "接收到 %(service_name)s �务更新，�自 %(host)s。"
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr "计算节点 %s 没有�务"
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
@@ -6954,10 +7011,10 @@ msgstr "schedule_%(method)s 失败：%(ex)s"
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr "无法统计调度器的选项文件 %(filename)s：“%(e)s�"
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
-msgstr "无法解�调度器的选项：“%(e)s�"
+msgid "Could not decode scheduler options: '%s'"
+msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
 #, python-format
@@ -6980,7 +7037,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7259,43 +7316,45 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr "正在�行的实例：%s"
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr "终止实例之�：%s"
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr "内部错误"
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr "强制�死实例�：%s"
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 #, fuzzy
 msgid "spawn error"
 msgstr "未知的guestmount错误"
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7428,12 +7487,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr "在%s 创建文件模拟客户代�"
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr "移除在 %s 的模拟的客户代�文件"
@@ -7443,25 +7502,25 @@ msgstr "移除在 %s 的模拟的客户代�文件"
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, fuzzy, python-format
 msgid "Loading compute driver '%s'"
 msgstr "LoggingVolumeDriver: %s"
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 #, fuzzy
 msgid "Unable to load the virtualization driver"
 msgstr "无法加载虚拟驱动：%s"
@@ -7471,7 +7530,7 @@ msgstr "无法加载虚拟驱动：%s"
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr "试图�过滤没有过滤的实例"
 
@@ -7526,37 +7585,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, fuzzy, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr "获�实例列表"
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7607,85 +7666,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "为实例 |%s| 分�浮动IP"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, fuzzy, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr "正在从glance镜��务器中下载镜� %s"
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "将 %(injection)s 注入到镜� %(img_id)s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "实例 %s 的网络分�"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, fuzzy, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr "获�实例 %s 控制�输出"
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, fuzzy, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr "实例 %s 的网络分�"
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, fuzzy, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr "等待RPC�应返回超时"
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "实例 %s 的网络分�"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "获�实例 %s 控制�输出"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr "节点处于未知的错误状�。"
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, fuzzy, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr "无法找到实例 %s 的宿主机"
@@ -7785,12 +7844,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, fuzzy, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr "无法确定iscsi initiator�字"
@@ -7800,7 +7859,7 @@ msgstr "无法确定iscsi initiator�字"
 msgid "No fixed PXE IP is associated to %s"
 msgstr "没有固定ip与实例关�"
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7814,23 +7873,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-#, fuzzy
-msgid "No more PXE IPs available"
-msgstr "没有更多的浮动ip。"
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, fuzzy, python-format
 msgid "Baremetal interface %s not found"
 msgstr "未找到分区"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "虚拟接�创建失败"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, fuzzy, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr "未找到分区"
@@ -7943,12 +7997,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8205,12 +8259,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, fuzzy, python-format
 msgid "File path %s not valid"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "更新代�失败：%(resp)r"
@@ -8239,23 +8293,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 #, fuzzy
 msgid "get_console_output called"
 msgstr "获�实例 %s 控制�输出"
@@ -8269,7 +8323,7 @@ msgstr "实例代�版本：%s"
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr "正在更新主机状�"
@@ -8635,12 +8689,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "为实例 |%s| 分�浮动IP"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, fuzzy, python-format
 msgid "Creating config drive at %(path)s"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, fuzzy, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr "注入文件路径：'%s'"
@@ -8806,7 +8860,7 @@ msgstr "Attach_volume: %(connection_info)s, %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "正在创建虚拟机实例快照 %s "
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr "无法确定iscsi initiator�字"
 
@@ -8845,248 +8899,248 @@ msgstr "无法为VDI %s 找到VBD"
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, fuzzy, python-format
 msgid "URI %s does not support events"
 msgstr "�组 %s �存在"
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr "连接 libvirt 失败"
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "正在连接 libvirt：%s"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr "销�时�生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 #, fuzzy
 msgid "During wait destroy, instance disappeared."
 msgstr "%s 在�行中消失了。"
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr "实例销��功。"
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 #, fuzzy
 msgid "Going to destroy instance again."
 msgstr "准备�止实例"
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt �生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, fuzzy, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr "在 undefine 时 libvirt �生错误。Code=%(errcode)s Error=%(e)s"
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
-msgstr "删除实例文件 %(target)s"
+msgid "Deleting instance files %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, fuzzy, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr "schedule_%(method)s 失败：%(ex)s"
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 #, fuzzy
 msgid "Could not determine fibre channel world wide node names"
 msgstr "无法确定iscsi initiator�字"
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 #, fuzzy
 msgid "Could not determine fibre channel world wide port names"
 msgstr "无法确定iscsi initiator�字"
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 #, fuzzy
 msgid "During detach_volume, instance disappeared."
 msgstr "%s 在�行中消失了。"
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 #, fuzzy
 msgid "attaching network adapter failed."
 msgstr "没有网络定义。"
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 #, fuzzy
 msgid "During detach_interface, instance disappeared."
 msgstr "%s 在�行中消失了。"
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 #, fuzzy
 msgid "detaching network adapter failed."
 msgstr "没有网络定义。"
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 #, fuzzy
 msgid "Instance soft rebooted successfully."
 msgstr "实例�功��。"
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 #, fuzzy
 msgid "Failed to soft reboot instance."
 msgstr "�新�动实例失败"
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 #, fuzzy
 msgid "Instance shutdown successfully."
 msgstr "实例�功生产。"
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr "实例�功��。"
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr "实例在�行"
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr "实例�功生产。"
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr "data：%(data)r, fpath: %(fpath)r"
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "用户没有管�员��"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr "正在创建镜�"
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, fuzzy, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr "将 %(injection)s 注入到镜� %(img_id)s"
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, fuzzy, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr "忽略�镜� %(img_id)s  注入的数�的错误 (%(e)s)"
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -9094,77 +9148,77 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代� %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 #, fuzzy
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr "无法得到CPU的数目，因为这个函数�是给这个平�执行的。这个错误�以被放心忽略。"
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr "libvirt版本过旧(�支�getVersion)"
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "正在获�镜� %s 的大�"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -9172,37 +9226,37 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, fuzzy, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr "创建tmpfile %s �通知其他的计算节点需�挂载相�的存储。"
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr "�存储�移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 #, fuzzy
 msgid "Live migration can not be used without shared storage."
 msgstr "�存储�移无法在共享存储使用"
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, fuzzy, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
@@ -9211,7 +9265,7 @@ msgstr ""
 "无法�移%(instance_id)s 到 %(dest)s 上：缺少�盘(主机:%(available)s <= "
 "实例:%(necessary)s)"
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
@@ -9220,7 +9274,7 @@ msgstr ""
 "已�动实例的CPU信�：\n"
 "%s"
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9235,74 +9289,74 @@ msgstr ""
 "\n"
 "�考 %(u)s"
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr "创建tmpfile %s �通知其他的计算节点需�挂载相�的存储。"
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
-#, fuzzy, python-format
-msgid "Live Migration failure: %(e)s"
-msgstr "预在线�移在%(dest)s失败"
+#: nova/virt/libvirt/driver.py:3332
+#, python-format
+msgid "Live Migration failure: %s"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, fuzzy, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr "plug_vifs() 失败%(cnt)d 次。最多�新�试 %(max_retry)d 次在主机 %(hostname)s。"
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, fuzzy, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr "查找 %(instance_name)s时libvirt出错：[错误代� %(error_code)s] %(ex)s"
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
-msgstr "因它��，所以跳过 %(path)s"
+msgid "skipping %s since it looks like volume"
+msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 #, fuzzy
 msgid "Starting migrate_disk_and_power_off"
 msgstr "实例 %s：开始执行 migrate_disk_and_power_off"
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 #, fuzzy
 msgid "Instance running successfully."
 msgstr "实例 %s �功�行。"
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 #, fuzzy
 msgid "Starting finish_migration"
 msgstr "实例 %s：开始执行 finish_migration"
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 #, fuzzy
 msgid "Starting finish_revert_migration"
 msgstr "实例 %s：开始执行 finish_revert_migration"
 
-#: nova/virt/libvirt/driver.py:3915
-#, fuzzy, python-format
-msgid "Checking instance files accessability%(instance_path)s"
-msgstr "删除实例文件 %(target)s"
+#: nova/virt/libvirt/driver.py:3942
+#, python-format
+msgid "Checking instance files accessability %s"
+msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
 msgid ""
@@ -9320,15 +9374,15 @@ msgstr "正在确���过滤器"
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
-msgstr "nwfilter(%(instance_filter_name)s)未找到"
+msgid "The nwfilter(%s) is not found."
+msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr "�称为 %(name)s 的nwfilter(%(instance_filter_name)s) 未找到。"
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr "iptables 防�墙：设置基本的过滤规则"
 
@@ -9523,48 +9577,48 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, fuzzy, python-format
 msgid "Unexpected vif_type=%s"
 msgstr "�外错误：%s"
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr "��vlan %(vlan)s 和桥 %(bridge)s"
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr "��桥 %s"
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 #, fuzzy
 msgid "Failed while unplugging vif"
 msgstr "移除实例�%s“的虚拟网络设备时失败"
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9572,7 +9626,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9580,7 +9634,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9588,7 +9642,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9804,7 +9858,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9952,32 +10006,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr "针对useconnection_type=vmwareapi必须指定vmwareapi_host_ip,vmwareapi_host_username和vmwareapi_host_password"
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, fuzzy, python-format
 msgid "VMware Cluster %s is not found"
 msgstr "没有找到标记 [%s]"
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr "在vmwareapi：_create_session，得到这个异常：%s"
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr "在vmwareapi：_call_method，得到这个异常：%s"
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状�：�功"
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr "任务 [%(task_name)s] %(task_ref)s 状�：错误 %(error_info)s"
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr "在vmwareapi：_poll_task，得到这个错误 %s"
@@ -9992,34 +10046,34 @@ msgstr "调用 RetrieveProperties 时�生错误 %s"
 msgid "%(text)s: _db_content => %(content)s"
 msgstr "%(text)s: _db_content => %(content)s"
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, fuzzy, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr "属性 %(attr)s 没有为管�对象 %(objName)s 设置"
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr "没有虚拟机注册"
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr "ref 为 %s 的虚拟机�存在"
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr "退出无效的会�或者已�退出了：%s"
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr "会�有错误"
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr "会�无效"
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 #, fuzzy
 msgid "No Virtual Machine has been registered yet"
 msgstr " 还没有虚拟机被注册"
@@ -10252,12 +10306,12 @@ msgstr "正在冷�动虚拟机 %s"
 msgid "Did hard reboot of VM"
 msgstr "已�冷�动虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 #, fuzzy
 msgid "Destroying the VM"
 msgstr "��xvp"
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 #, fuzzy
 msgid "Destroyed the VM"
 msgstr "已�注销虚拟机 %s"
@@ -10378,103 +10432,103 @@ msgstr "正在关闭虚拟机 %s"
 msgid "Powered on the VM"
 msgstr "关闭虚拟机 %s"
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, fuzzy, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr "将实例 '%(instance_uuid)s' 的进度更新到 %(progress)d"
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, fuzzy, python-format
 msgid "Renaming the VM to %s"
 msgstr "正在删除volumeID：%s "
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 #, fuzzy
 msgid "instance not present"
 msgstr "实例 - %s �存在"
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, fuzzy, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr "注销虚拟机时在 vmwareapi:vmops:destroy 中�生异常：%s"
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, fuzzy, python-format
 msgid "Renaming the VM from %s"
 msgstr "正在删除volumeID：%s "
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "从快照 %s 创建�"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr "找到%(instance_count)d个超过%(timeout)d秒悬挂的��"
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, fuzzy, python-format
 msgid "Automatically hard rebooting %d"
 msgstr "自动冷�� %d"
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr "get_diagnostics 没有在 vmwareapi 里实现"
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 #, fuzzy
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr "正在�新�置虚拟机实例 %s �附加镜��盘"
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 #, fuzzy
 msgid "Reconfigured VM instance to set the machine id"
 msgstr "已��新�置虚拟机实例 %s �附加于镜��盘"
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, fuzzy, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr "正在�新�置实例 %(name)s �设置机器的id为ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, fuzzy, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr "已��新�置虚拟机实例 %(name)s �设置机器的id为ip - %(ip_addr)s"
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr "正在使用路径 %s 创建目录"
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr "已�创建路径为 %s 的目录"
@@ -10597,106 +10651,87 @@ msgstr "没有在数�库找到�"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "挂载点 %(mountpoint)s 从实例 %(instance_name)s 分离"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, 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:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, fuzzy, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr "对 %(method)s 的调用返回错误：%(e)s。"
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr "查询代�版本"
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, fuzzy, python-format
 msgid "Updating agent to %s"
 msgstr "把代�更新为 %s"
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr "设置管�员密�"
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, fuzzy, python-format
 msgid "Injecting file path: %r"
 msgstr "注入文件路径：'%s'"
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr "�置网络"
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr "安装在该镜�的XenServer工具�以进行网络注入。网络文件�会被�作。"
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr "该镜�有XenServer工具，但是�能进行网络注入"
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr "没有在该镜�上安装XenServer工具"
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr "OpenSSL错误：%s"
@@ -10715,54 +10750,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, fuzzy, python-format
 msgid "Could not determine key: %s"
 msgstr "解密�钥失败：%s"
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr "�支�在XenServer�动主机"
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr "无法登录到XenAPI(Dom0�盘是空么？)"
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr "得到异常：%s"
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr "产生 NotImplemented 错误"
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr "xenapi.fake 没有 %s 的实现"
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, fuzzy, python-format
 msgid "Calling setter %s"
 msgstr "调用 getter %s"
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11679,9 +11714,3 @@ msgstr "状�必须�用"
 msgid "status must be 'available'"
 msgstr "状�必须�用"
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr "�书 %(certificate_id)s 没有找到。"
-
-#~ msgid "quantum authentication failed"
-#~ msgstr "认�错误"
-
diff --git a/nova/locale/zh_HK/LC_MESSAGES/nova.po b/nova/locale/zh_HK/LC_MESSAGES/nova.po
index 539252510..a2d47c43f 100644
--- a/nova/locale/zh_HK/LC_MESSAGES/nova.po
+++ b/nova/locale/zh_HK/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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+0000\n"
 "PO-Revision-Date: 2013-05-28 17:08+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Hong Kong) "
@@ -80,298 +80,298 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr ""
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr ""
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr ""
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr ""
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr ""
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr ""
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 msgid "Failed to deploy instance"
 msgstr ""
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2134,89 +2149,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2264,6 +2297,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2310,7 +2344,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2652,9 +2686,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2716,6 +2750,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2876,7 +2911,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2916,32 +2952,32 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 msgid "Invalid path"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2952,26 +2988,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3019,7 +3058,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3258,30 +3297,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3293,7 +3338,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3310,16 +3355,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3402,12 +3447,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3490,38 +3540,38 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr ""
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 msgid "Got update to delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3536,28 +3586,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3616,17 +3666,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3984,244 +4034,244 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr ""
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 msgid "instance termination disabled"
 msgstr ""
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, python-format
 msgid "Unable to update system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, python-format
 msgid "Unable to delete system group '%s'"
 msgstr ""
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4285,12 +4335,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4315,653 +4365,653 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 msgid "Failed to resume instance"
 msgstr ""
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, python-format
 msgid "Detaching from volume api: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 msgid "Error trying to Rescue Instance"
 msgstr ""
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, python-format
 msgid "Failed to attach volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 msgid "Detaching volume from unknown instance"
 msgstr ""
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, python-format
 msgid "Failed to detach volume %(volume_id)s from %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5081,15 +5131,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5168,7 +5237,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5227,7 +5296,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5842,75 +5911,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5936,7 +6005,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6203,11 +6272,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6632,86 +6696,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6746,23 +6803,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6772,9 +6829,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6798,7 +6855,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7075,42 +7132,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7237,12 +7296,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7252,25 +7311,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7279,7 +7338,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7333,37 +7392,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7411,85 +7470,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, python-format
 msgid "PXE deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7586,12 +7645,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7601,7 +7660,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7615,22 +7674,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, python-format
 msgid "Baremetal interface %s already in use"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7743,12 +7798,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8001,12 +8056,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr ""
@@ -8035,23 +8090,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8064,7 +8119,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8416,12 +8471,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8579,7 +8634,7 @@ msgstr ""
 msgid "Detaching physical disk from instance: %s"
 msgstr ""
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8618,236 +8673,236 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 msgid "Guest does not have a console available"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8855,76 +8910,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8932,50 +8987,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -8985,69 +9040,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9066,15 +9121,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9265,47 +9320,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9313,7 +9368,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9321,7 +9376,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9329,7 +9384,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9540,7 +9595,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9686,32 +9741,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9726,34 +9781,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9965,11 +10020,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10074,100 +10129,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, python-format
 msgid "Renamed the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10288,106 +10343,87 @@ msgstr ""
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10403,54 +10439,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11337,9 +11373,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/locale/zh_TW/LC_MESSAGES/nova.po b/nova/locale/zh_TW/LC_MESSAGES/nova.po
index f48f2d168..584c784ea 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-06-19 19:38+0000\n"
+"POT-Creation-Date: 2013-06-26 19:37+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"
@@ -79,299 +79,299 @@ msgstr ""
 msgid "Flags path: %s"
 msgstr ""
 
-#: nova/exception.py:112
+#: nova/exception.py:113
 msgid "An unknown exception occurred."
 msgstr "發生一個未知例外"
 
-#: nova/exception.py:133 nova/openstack/common/rpc/common.py:87
+#: nova/exception.py:135 nova/openstack/common/rpc/common.py:87
 msgid "Exception in string format operation"
 msgstr ""
 
-#: nova/exception.py:153
+#: nova/exception.py:155
 msgid "Unknown"
 msgstr ""
 
-#: nova/exception.py:163
+#: nova/exception.py:165
 #, fuzzy, python-format
 msgid "Failed to encrypt text: %(reason)s"
 msgstr "內文解碼失敗"
 
-#: nova/exception.py:167
+#: nova/exception.py:169
 #, fuzzy, python-format
 msgid "Failed to decrypt text: %(reason)s"
 msgstr "內文解碼失敗"
 
-#: nova/exception.py:171
+#: nova/exception.py:173
 msgid "Virtual Interface creation failed"
 msgstr "建立虛擬介�失敗"
 
-#: nova/exception.py:175
+#: nova/exception.py:177
 msgid "5 attempts to create virtual interfacewith unique mac address failed"
 msgstr "連續嘗試 5 次建立唯一網路�置(MAC)的虛擬介�失敗"
 
-#: nova/exception.py:180
+#: nova/exception.py:182
 #, python-format
 msgid "Connection to glance host %(host)s:%(port)s failed: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:185
+#: nova/exception.py:187
 msgid "Not authorized."
 msgstr "未被授權"
 
-#: nova/exception.py:190
+#: nova/exception.py:192
 msgid "User does not have admin privileges"
 msgstr "使用者並沒有管�者權力"
 
-#: nova/exception.py:194
+#: nova/exception.py:196
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: nova/exception.py:198
+#: nova/exception.py:200
 #, python-format
 msgid "Image %(image_id)s is not active."
 msgstr ""
 
-#: nova/exception.py:202
+#: nova/exception.py:204
 #, python-format
 msgid "Not authorized for image %(image_id)s."
 msgstr ""
 
-#: nova/exception.py:206
+#: nova/exception.py:208
 msgid "Unacceptable parameters."
 msgstr "��接�的�數值"
 
-#: nova/exception.py:211
+#: nova/exception.py:213
 msgid "Block Device Mapping is Invalid."
 msgstr ""
 
-#: nova/exception.py:215
+#: nova/exception.py:217
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get snapshot %(id)s."
 msgstr ""
 
-#: nova/exception.py:220
+#: nova/exception.py:222
 #, python-format
 msgid "Block Device Mapping is Invalid: failed to get volume %(id)s."
 msgstr ""
 
-#: nova/exception.py:225
+#: nova/exception.py:227
 msgid ""
 "Block Device Mapping is Invalid: some fields are not recognized, or have "
 "invalid values."
 msgstr ""
 
-#: nova/exception.py:231
+#: nova/exception.py:233
 msgid "Block Device Mapping cannot be converted to legacy format. "
 msgstr ""
 
-#: nova/exception.py:236
+#: nova/exception.py:238
 #, python-format
 msgid "Volume %(volume_id)s is not attached to anything"
 msgstr ""
 
-#: nova/exception.py:240
+#: nova/exception.py:242
 #, python-format
 msgid ""
 "Volume %(volume_id)s did not finish being created even after we waited "
 "%(seconds)s seconds or %(attempts)s attempts."
 msgstr ""
 
-#: nova/exception.py:246 nova/api/ec2/cloud.py:473
+#: nova/exception.py:248 nova/api/ec2/cloud.py:472
 msgid "Keypair data is invalid"
 msgstr "無效的Keypair"
 
-#: nova/exception.py:250
+#: nova/exception.py:252
 msgid "The request is invalid."
 msgstr ""
 
-#: nova/exception.py:254
+#: nova/exception.py:256
 msgid "Invalid input received"
 msgstr ""
 
-#: nova/exception.py:258
+#: nova/exception.py:260
 msgid "Invalid volume"
 msgstr ""
 
-#: nova/exception.py:262 nova/api/openstack/compute/servers.py:1338
+#: nova/exception.py:264 nova/api/openstack/compute/servers.py:1338
 #: nova/api/openstack/compute/contrib/admin_actions.py:242
 #: nova/api/openstack/compute/plugins/v3/servers.py:1426
 msgid "Invalid metadata"
 msgstr ""
 
-#: nova/exception.py:266
+#: nova/exception.py:268
 msgid "Invalid metadata size"
 msgstr ""
 
-#: nova/exception.py:270
+#: nova/exception.py:272
 #, python-format
 msgid "Invalid port range %(from_port)s:%(to_port)s. %(msg)s"
 msgstr ""
 
-#: nova/exception.py:274
+#: nova/exception.py:276
 #, python-format
 msgid "Invalid IP protocol %(protocol)s."
 msgstr ""
 
-#: nova/exception.py:278
+#: nova/exception.py:280
 #, python-format
 msgid "Invalid content type %(content_type)s."
 msgstr ""
 
-#: nova/exception.py:282
+#: nova/exception.py:284
 #, python-format
 msgid "Invalid cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:286 nova/openstack/common/db/exception.py:44
+#: nova/exception.py:288 nova/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: nova/exception.py:293
+#: nova/exception.py:295
 #, python-format
 msgid "%(err)s"
 msgstr ""
 
-#: nova/exception.py:297
+#: nova/exception.py:299
 #, python-format
 msgid ""
 "Cannot perform action '%(action)s' on aggregate %(aggregate_id)s. Reason:"
 " %(reason)s."
 msgstr ""
 
-#: nova/exception.py:302
+#: nova/exception.py:304
 #, python-format
 msgid "Group not valid. Reason: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:306 nova/openstack/common/db/sqlalchemy/utils.py:33
+#: nova/exception.py:308 nova/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: nova/exception.py:310
+#: nova/exception.py:312
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s in %(attr)s %(state)s. Cannot %(method)s while"
 " the instance is in this state."
 msgstr ""
 
-#: nova/exception.py:315
+#: nova/exception.py:317
 #, python-format
 msgid "Instance %(instance_id)s is not running."
 msgstr ""
 
-#: nova/exception.py:319
+#: nova/exception.py:321
 #, python-format
 msgid "Instance %(instance_id)s is not in rescue mode"
 msgstr ""
 
-#: nova/exception.py:323
+#: nova/exception.py:325
 #, python-format
 msgid "Instance %(instance_id)s cannot be rescued: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:327
+#: nova/exception.py:329
 #, python-format
 msgid "Instance %(instance_id)s is not ready"
 msgstr ""
 
-#: nova/exception.py:331
+#: nova/exception.py:333
 msgid "Failed to suspend instance"
 msgstr ""
 
-#: nova/exception.py:335
+#: nova/exception.py:337
 #, fuzzy, python-format
 msgid "Failed to resume instance: %(reason)s."
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/exception.py:339
+#: nova/exception.py:341
 #, python-format
 msgid "Failed to power on instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:343
+#: nova/exception.py:345
 #, python-format
 msgid "Failed to power off instance: %(reason)s."
 msgstr ""
 
-#: nova/exception.py:347
+#: nova/exception.py:349
 msgid "Failed to reboot instance"
 msgstr ""
 
-#: nova/exception.py:351
+#: nova/exception.py:353
 msgid "Failed to terminate instance"
 msgstr ""
 
-#: nova/exception.py:355
+#: nova/exception.py:357
 #, fuzzy
 msgid "Failed to deploy instance"
 msgstr "無法�載 Volume %s"
 
-#: nova/exception.py:359
+#: nova/exception.py:361
 msgid "Service is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:363
+#: nova/exception.py:365
 msgid "Insufficient compute resources."
 msgstr ""
 
-#: nova/exception.py:367
+#: nova/exception.py:369
 #, python-format
 msgid "Compute service of %(host)s is unavailable at this time."
 msgstr ""
 
-#: nova/exception.py:371
+#: nova/exception.py:373
 #, python-format
 msgid "Unable to migrate instance (%(instance_id)s) to current host (%(host)s)."
 msgstr ""
 
-#: nova/exception.py:376
+#: nova/exception.py:378
 msgid "The supplied hypervisor type of is invalid."
 msgstr ""
 
-#: nova/exception.py:380
+#: nova/exception.py:382
 msgid "The instance requires a newer hypervisor version than has been provided."
 msgstr ""
 
-#: nova/exception.py:385
+#: nova/exception.py:387
 #, python-format
 msgid ""
 "The supplied disk path (%(path)s) already exists, it is expected not to "
 "exist."
 msgstr ""
 
-#: nova/exception.py:390
+#: nova/exception.py:392
 #, python-format
 msgid "The supplied device path (%(path)s) is invalid."
 msgstr ""
 
-#: nova/exception.py:394
+#: nova/exception.py:396
 #, python-format
 msgid "The supplied device path (%(path)s) is in use."
 msgstr ""
 
-#: nova/exception.py:399
+#: nova/exception.py:401
 #, python-format
 msgid "The supplied device (%(device)s) is busy."
 msgstr ""
 
-#: nova/exception.py:403
+#: nova/exception.py:405
 msgid "Unacceptable CPU info"
 msgstr ""
 
-#: nova/exception.py:407
+#: nova/exception.py:409
 #, python-format
 msgid "%(address)s is not a valid IP v4/6 address."
 msgstr ""
 
-#: nova/exception.py:411
+#: nova/exception.py:413
 #, python-format
 msgid ""
 "VLAN tag is not appropriate for the port group %(bridge)s. Expected VLAN "
 "tag is %(tag)s, but the one associated with the port group is %(pgroup)s."
 msgstr ""
 
-#: nova/exception.py:417
+#: nova/exception.py:419
 #, python-format
 msgid ""
 "vSwitch which contains the port group %(bridge)s is not associated with "
@@ -379,85 +379,85 @@ msgid ""
 "one associated is %(actual)s."
 msgstr ""
 
-#: nova/exception.py:424
+#: nova/exception.py:426
 #, python-format
 msgid "Disk format %(disk_format)s is not acceptable"
 msgstr ""
 
-#: nova/exception.py:428
+#: nova/exception.py:430
 #, python-format
 msgid "Image %(image_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:432
+#: nova/exception.py:434
 #, python-format
 msgid "Instance %(instance_id)s is unacceptable: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:436
+#: nova/exception.py:438
 #, python-format
 msgid "Ec2 id %(ec2_id)s is unacceptable."
 msgstr ""
 
-#: nova/exception.py:440
+#: nova/exception.py:442
 #, python-format
 msgid "Expected a uuid but received %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:444
+#: nova/exception.py:446
 #, python-format
 msgid "Invalid ID received %(id)s."
 msgstr ""
 
-#: nova/exception.py:448
+#: nova/exception.py:450
 msgid "Constraint not met."
 msgstr ""
 
-#: nova/exception.py:453
+#: nova/exception.py:455
 msgid "Resource could not be found."
 msgstr ""
 
-#: nova/exception.py:458
+#: nova/exception.py:460
 #, python-format
 msgid "No agent-build associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:462
+#: nova/exception.py:464
 #, python-format
 msgid "Volume %(volume_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:466
+#: nova/exception.py:468
 #, python-format
 msgid "Snapshot %(snapshot_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:470
+#: nova/exception.py:472
 #, python-format
 msgid "No target id found for volume %(volume_id)s."
 msgstr ""
 
-#: nova/exception.py:474
+#: nova/exception.py:476
 #, python-format
 msgid "No disk at %(location)s"
 msgstr ""
 
-#: nova/exception.py:478
+#: nova/exception.py:480
 #, python-format
 msgid "Could not find a handler for %(driver_type)s volume."
 msgstr ""
 
-#: nova/exception.py:482
+#: nova/exception.py:484
 #, python-format
 msgid "Invalid image href %(image_href)s."
 msgstr ""
 
-#: nova/exception.py:486
+#: nova/exception.py:488
 #, python-format
 msgid "Image %(image_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:490
+#: nova/exception.py:492
 #, python-format
 msgid ""
 "Image %(image_id)s could not be found. The nova EC2 API assigns image ids"
@@ -465,896 +465,911 @@ msgid ""
 "image ids since adding this image?"
 msgstr ""
 
-#: nova/exception.py:497
+#: nova/exception.py:499
 #, python-format
 msgid "Project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:501
+#: nova/exception.py:503
 msgid "Cannot find SR to read/write VDI."
 msgstr ""
 
-#: nova/exception.py:505
+#: nova/exception.py:507
 #, python-format
 msgid "Network %(network_id)s is duplicated."
 msgstr ""
 
-#: nova/exception.py:509
+#: nova/exception.py:511
 #, python-format
 msgid "Network %(network_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:513
+#: nova/exception.py:515
 #, python-format
 msgid "%(req)s is required to create a network."
 msgstr ""
 
-#: nova/exception.py:517
+#: nova/exception.py:519
 #, python-format
 msgid "Network %(network_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:521
+#: nova/exception.py:523
 #, python-format
 msgid "Port id %(port_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:525
+#: nova/exception.py:527
 #, python-format
 msgid "Network could not be found for bridge %(bridge)s"
 msgstr ""
 
-#: nova/exception.py:529
+#: nova/exception.py:531
 #, python-format
 msgid "Network could not be found for uuid %(uuid)s"
 msgstr ""
 
-#: nova/exception.py:533
+#: nova/exception.py:535
 #, python-format
 msgid "Network could not be found with cidr %(cidr)s."
 msgstr ""
 
-#: nova/exception.py:537
+#: nova/exception.py:539
 #, python-format
 msgid "Network could not be found for instance %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:541
+#: nova/exception.py:543
 msgid "No networks defined."
 msgstr ""
 
-#: nova/exception.py:545
+#: nova/exception.py:547
 #, python-format
 msgid ""
 "Either Network uuid %(network_uuid)s is not present or is not assigned to"
 " the project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:550
+#: nova/exception.py:552
 msgid "Could not find the datastore reference(s) which the VM uses."
 msgstr ""
 
-#: nova/exception.py:554
+#: nova/exception.py:556
 #, python-format
 msgid "Port %(port_id)s is still in use."
 msgstr ""
 
-#: nova/exception.py:558
+#: nova/exception.py:560
 #, fuzzy, python-format
 msgid "Port %(port_id)s not usable for instance %(instance)s."
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:562
+#: nova/exception.py:564
 #, python-format
 msgid "No free port available for instance %(instance)s."
 msgstr ""
 
-#: nova/exception.py:566
+#: nova/exception.py:568
 #, python-format
 msgid "No fixed IP associated with id %(id)s."
 msgstr ""
 
-#: nova/exception.py:570
+#: nova/exception.py:572
 #, python-format
 msgid "Fixed ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:574
+#: nova/exception.py:576
 #, python-format
 msgid "Instance %(instance_uuid)s has zero fixed ips."
 msgstr ""
 
-#: nova/exception.py:578
+#: nova/exception.py:580
 #, python-format
 msgid "Network host %(host)s has zero fixed ips in network %(network_id)s."
 msgstr ""
 
-#: nova/exception.py:583
+#: nova/exception.py:585
 #, python-format
 msgid "Instance %(instance_uuid)s doesn't have fixed ip '%(ip)s'."
 msgstr ""
 
-#: nova/exception.py:587
+#: nova/exception.py:589
 #, python-format
 msgid ""
 "Fixed IP address (%(address)s) does not exist in network "
 "(%(network_uuid)s)."
 msgstr ""
 
-#: nova/exception.py:592
+#: nova/exception.py:594
 #, python-format
 msgid ""
 "Fixed IP address %(address)s is already in use on instance "
 "%(instance_uuid)s."
 msgstr ""
 
-#: nova/exception.py:597
+#: nova/exception.py:599
 #, python-format
 msgid "More than one instance is associated with fixed ip address '%(address)s'."
 msgstr ""
 
-#: nova/exception.py:602
+#: nova/exception.py:604
 #, python-format
 msgid "Fixed IP address %(address)s is invalid."
 msgstr ""
 
-#: nova/exception.py:606
+#: nova/exception.py:608
 msgid "Zero fixed ips available."
 msgstr ""
 
-#: nova/exception.py:610
+#: nova/exception.py:612
 msgid "Zero fixed ips could be found."
 msgstr ""
 
-#: nova/exception.py:619
+#: nova/exception.py:621
 #, python-format
 msgid "Floating ip %(address)s already exists."
 msgstr ""
 
-#: nova/exception.py:623
+#: nova/exception.py:625
 #, python-format
 msgid "Floating ip not found for id %(id)s."
 msgstr ""
 
-#: nova/exception.py:627
+#: nova/exception.py:629
 #, python-format
 msgid "The DNS entry %(name)s already exists in domain %(domain)s."
 msgstr ""
 
-#: nova/exception.py:631
+#: nova/exception.py:633
 #, python-format
 msgid "Floating ip not found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:635
+#: nova/exception.py:637
 #, python-format
 msgid "Floating ip not found for host %(host)s."
 msgstr ""
 
-#: nova/exception.py:639
+#: nova/exception.py:641
 #, python-format
 msgid "Multiple floating ips are found for address %(address)s."
 msgstr ""
 
-#: nova/exception.py:643
+#: nova/exception.py:645
 msgid "Floating ip pool not found."
 msgstr ""
 
-#: nova/exception.py:648
+#: nova/exception.py:650
 msgid "Zero floating ips available."
 msgstr ""
 
-#: nova/exception.py:653
+#: nova/exception.py:655
 #, python-format
 msgid "Floating ip %(address)s is associated."
 msgstr ""
 
-#: nova/exception.py:657
+#: nova/exception.py:659
 #, python-format
 msgid "Floating ip %(address)s is not associated."
 msgstr ""
 
-#: nova/exception.py:661
+#: nova/exception.py:663
 msgid "Zero floating ips exist."
 msgstr ""
 
-#: nova/exception.py:665
+#: nova/exception.py:667
 #, python-format
 msgid "Interface %(interface)s not found."
 msgstr ""
 
-#: nova/exception.py:669
+#: nova/exception.py:671
 msgid "Cannot disassociate auto assigined floating ip"
 msgstr ""
 
-#: nova/exception.py:673
+#: nova/exception.py:675
 #, python-format
 msgid "Keypair %(name)s not found for user %(user_id)s"
 msgstr ""
 
-#: nova/exception.py:677
+#: nova/exception.py:679
 #, python-format
 msgid "Service %(service_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:681
+#: nova/exception.py:683
 #, python-format
 msgid "Host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:685
+#: nova/exception.py:687
 #, python-format
 msgid "Compute host %(host)s could not be found."
 msgstr ""
 
-#: nova/exception.py:689
+#: nova/exception.py:691
 #, python-format
 msgid "Could not find binary %(binary)s on host %(host)s."
 msgstr ""
 
-#: nova/exception.py:693
+#: nova/exception.py:695
 #, python-format
 msgid "Invalid reservation expiration %(expire)s."
 msgstr ""
 
-#: nova/exception.py:697
+#: nova/exception.py:699
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: nova/exception.py:702
+#: nova/exception.py:704
 msgid "Quota could not be found"
 msgstr ""
 
-#: nova/exception.py:706
+#: nova/exception.py:708
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: nova/exception.py:710
+#: nova/exception.py:712
 #, python-format
 msgid "Quota for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:714
+#: nova/exception.py:716
 #, python-format
 msgid "Quota class %(class_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:718
+#: nova/exception.py:720
 #, python-format
 msgid "Quota usage for project %(project_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:722
+#: nova/exception.py:724
 #, python-format
 msgid "Quota reservation %(uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:726
+#: nova/exception.py:728
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: nova/exception.py:730
+#: nova/exception.py:732
 #, python-format
 msgid "Security group %(security_group_id)s not found."
 msgstr ""
 
-#: nova/exception.py:734
+#: nova/exception.py:736
 #, python-format
 msgid "Security group %(security_group_id)s not found for project %(project_id)s."
 msgstr ""
 
-#: nova/exception.py:739
+#: nova/exception.py:741
 #, python-format
 msgid "Security group with rule %(rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:743
+#: nova/exception.py:745
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is already associated with the "
 "instance %(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:748
+#: nova/exception.py:750
 #, python-format
 msgid ""
 "Security group %(security_group_id)s is not associated with the instance "
 "%(instance_id)s"
 msgstr ""
 
-#: nova/exception.py:753
+#: nova/exception.py:755
 #, python-format
 msgid "Security group default rule (%rule_id)s not found."
 msgstr ""
 
-#: nova/exception.py:757
+#: nova/exception.py:759
 msgid ""
 "Network requires port_security_enabled and subnet associated in order to "
 "apply security groups."
 msgstr ""
 
-#: nova/exception.py:762
+#: nova/exception.py:764
 msgid "No Unique Match Found."
 msgstr ""
 
-#: nova/exception.py:767
+#: nova/exception.py:769
 #, python-format
 msgid "Migration %(migration_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:771
+#: nova/exception.py:773
 #, python-format
 msgid "Migration not found for instance %(instance_id)s with status %(status)s."
 msgstr ""
 
-#: nova/exception.py:776
+#: nova/exception.py:778
 #, python-format
 msgid "Console pool %(pool_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:780
+#: nova/exception.py:782
 #, python-format
 msgid ""
 "Console pool of type %(console_type)s for compute host %(compute_host)s "
 "on proxy host %(host)s not found."
 msgstr ""
 
-#: nova/exception.py:786
+#: nova/exception.py:788
 #, python-format
 msgid "Console %(console_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:790
+#: nova/exception.py:792
 #, python-format
 msgid "Console for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:794
+#: nova/exception.py:796
 #, python-format
 msgid ""
 "Console for instance %(instance_uuid)s in pool %(pool_id)s could not be "
 "found."
 msgstr ""
 
-#: nova/exception.py:799
+#: nova/exception.py:801
 #, python-format
 msgid "Invalid console type %(console_type)s"
 msgstr ""
 
-#: nova/exception.py:803
+#: nova/exception.py:805
 #, python-format
 msgid "Instance type %(instance_type_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:807
+#: nova/exception.py:809
 #, python-format
 msgid "Instance type with name %(instance_type_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:812
+#: nova/exception.py:814
 #, python-format
 msgid "Flavor %(flavor_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:816
+#: nova/exception.py:818
 #, python-format
 msgid "Flavor access not found for %(flavor_id)s / %(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:821
+#: nova/exception.py:823
 #, python-format
 msgid "Cell %(cell_name)s doesn't exist."
 msgstr ""
 
-#: nova/exception.py:825
+#: nova/exception.py:827
 #, python-format
 msgid "Cell with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:829
+#: nova/exception.py:831
 #, python-format
 msgid "Inconsistency in cell routing: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:833
+#: nova/exception.py:835
 #, python-format
 msgid "Service API method not found: %(detail)s"
 msgstr ""
 
-#: nova/exception.py:837
+#: nova/exception.py:839
 msgid "Timeout waiting for response from cell"
 msgstr ""
 
-#: nova/exception.py:841
+#: nova/exception.py:843
 #, python-format
 msgid "Cell message has reached maximum hop count: %(hop_count)s"
 msgstr ""
 
-#: nova/exception.py:845
+#: nova/exception.py:847
 msgid "No cells available matching scheduling criteria."
 msgstr ""
 
-#: nova/exception.py:849
+#: nova/exception.py:851
 #, python-format
 msgid "Exception received during cell processing: %(exc_name)s."
 msgstr ""
 
-#: nova/exception.py:853
+#: nova/exception.py:855
 #, python-format
 msgid "Cell is not known for instance %(instance_uuid)s"
 msgstr ""
 
-#: nova/exception.py:857
+#: nova/exception.py:859
 #, python-format
 msgid "Scheduler Host Filter %(filter_name)s could not be found."
 msgstr ""
 
-#: nova/exception.py:861
+#: nova/exception.py:863
 #, python-format
 msgid "Instance %(instance_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:866
+#: nova/exception.py:868
 #, python-format
 msgid ""
 "Instance %(instance_uuid)s has no system metadata with key "
 "%(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:871
+#: nova/exception.py:873
 #, python-format
 msgid ""
 "Instance Type %(instance_type_id)s has no extra specs with key "
 "%(extra_specs_key)s."
 msgstr ""
 
-#: nova/exception.py:876
+#: nova/exception.py:878
 #, python-format
 msgid "File %(file_path)s could not be found."
 msgstr ""
 
-#: nova/exception.py:880
+#: nova/exception.py:882
 msgid "Zero files could be found."
 msgstr ""
 
-#: nova/exception.py:884
+#: nova/exception.py:886
 #, python-format
 msgid "Virtual switch associated with the network adapter %(adapter)s not found."
 msgstr ""
 
-#: nova/exception.py:889
+#: nova/exception.py:891
 #, python-format
 msgid "Network adapter %(adapter)s could not be found."
 msgstr ""
 
-#: nova/exception.py:893
+#: nova/exception.py:895
 #, python-format
 msgid "Class %(class_name)s could not be found: %(exception)s"
 msgstr ""
 
-#: nova/exception.py:897
+#: nova/exception.py:899
 msgid "Action not allowed."
 msgstr ""
 
-#: nova/exception.py:901
+#: nova/exception.py:903
 msgid "Rotation is not allowed for snapshots"
 msgstr ""
 
-#: nova/exception.py:905
+#: nova/exception.py:907
 msgid "Rotation param is required for backup image_type"
 msgstr ""
 
-#: nova/exception.py:909 nova/tests/compute/test_keypairs.py:118
+#: nova/exception.py:911 nova/tests/compute/test_keypairs.py:118
 #, python-format
 msgid "Key pair '%(key_name)s' already exists."
 msgstr ""
 
-#: nova/exception.py:913
+#: nova/exception.py:915
 #, python-format
 msgid "Instance %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:917
+#: nova/exception.py:919
 #, python-format
 msgid "Instance Type with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:921
+#: nova/exception.py:923
 #, python-format
 msgid "Instance Type with ID %(flavor_id)s already exists."
 msgstr ""
 
-#: nova/exception.py:925
+#: nova/exception.py:927
 #, python-format
 msgid ""
 "Flavor access alreay exists for flavor %(flavor_id)s and project "
 "%(project_id)s combination."
 msgstr ""
 
-#: nova/exception.py:930
+#: nova/exception.py:932
 #, python-format
 msgid "%(path)s is not on shared storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:934
+#: nova/exception.py:936
 #, python-format
 msgid "%(path)s is not on local storage: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:938
+#: nova/exception.py:940
 msgid "Migration error"
 msgstr ""
 
-#: nova/exception.py:942
+#: nova/exception.py:944
 msgid "Migration pre-check error"
 msgstr ""
 
-#: nova/exception.py:946
+#: nova/exception.py:948
 #, python-format
 msgid "Malformed message body: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:952
+#: nova/exception.py:954
 #, python-format
 msgid "Could not find config at %(path)s"
 msgstr ""
 
-#: nova/exception.py:956
+#: nova/exception.py:958
 #, python-format
 msgid "Could not load paste app '%(name)s' from %(path)s"
 msgstr ""
 
-#: nova/exception.py:960
+#: nova/exception.py:962
 msgid "When resizing, instances must change flavor!"
 msgstr ""
 
-#: nova/exception.py:964
+#: nova/exception.py:966
 #, python-format
 msgid "Resize error: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:968
+#: nova/exception.py:970
 #, python-format
 msgid "Server disk was unable to be resized because: %(reason)s"
 msgstr ""
 
-#: nova/exception.py:972
+#: nova/exception.py:974
 msgid "Instance type's memory is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:976
+#: nova/exception.py:978
 msgid "Instance type's disk is too small for requested image."
 msgstr ""
 
-#: nova/exception.py:980
+#: nova/exception.py:982
 #, python-format
 msgid "Insufficient free memory on compute node to start %(uuid)s."
 msgstr ""
 
-#: nova/exception.py:984
+#: nova/exception.py:986
 msgid "Could not fetch bandwidth/cpu/disk metrics for this host."
 msgstr ""
 
-#: nova/exception.py:988
+#: nova/exception.py:990
 #, python-format
 msgid "No valid host was found. %(reason)s"
 msgstr ""
 
-#: nova/exception.py:992
+#: nova/exception.py:994
 msgid "Quota exceeded"
 msgstr ""
 
-#: nova/exception.py:999
+#: nova/exception.py:1001
 #, python-format
 msgid ""
 "Quota exceeded for %(overs)s: Requested %(req)s, but already used "
 "%(used)d of %(allowed)d %(resource)s"
 msgstr ""
 
-#: nova/exception.py:1004
+#: nova/exception.py:1006
 msgid "Maximum number of floating ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1008
+#: nova/exception.py:1010
 msgid "Maximum number of fixed ips exceeded"
 msgstr ""
 
-#: nova/exception.py:1012
+#: nova/exception.py:1014
 #, python-format
 msgid "Maximum number of metadata items exceeds %(allowed)d"
 msgstr ""
 
-#: nova/exception.py:1016
+#: nova/exception.py:1018
 msgid "Personality file limit exceeded"
 msgstr ""
 
-#: nova/exception.py:1020
+#: nova/exception.py:1022
 msgid "Personality file path too long"
 msgstr ""
 
-#: nova/exception.py:1024
+#: nova/exception.py:1026
 msgid "Personality file content too long"
 msgstr ""
 
-#: nova/exception.py:1028 nova/tests/compute/test_keypairs.py:129
+#: nova/exception.py:1030 nova/tests/compute/test_keypairs.py:129
 msgid "Maximum number of key pairs exceeded"
 msgstr ""
 
-#: nova/exception.py:1032
+#: nova/exception.py:1034
 msgid "Maximum number of security groups or rules exceeded"
 msgstr ""
 
-#: nova/exception.py:1036
+#: nova/exception.py:1038
 #, python-format
 msgid ""
 "Aggregate %(aggregate_id)s: action '%(action)s' caused an error: "
 "%(reason)s."
 msgstr ""
 
-#: nova/exception.py:1041
+#: nova/exception.py:1043
 #, python-format
 msgid "Aggregate %(aggregate_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1045
+#: nova/exception.py:1047
 #, python-format
 msgid "Aggregate %(aggregate_name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1049
+#: nova/exception.py:1051
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1053
+#: nova/exception.py:1055
 #, python-format
 msgid "Aggregate %(aggregate_id)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1058
+#: nova/exception.py:1060
 #, python-format
 msgid "Aggregate %(aggregate_id)s already has host %(host)s."
 msgstr ""
 
-#: nova/exception.py:1062
+#: nova/exception.py:1064
 msgid "Unable to create instance type"
 msgstr ""
 
-#: nova/exception.py:1066
+#: nova/exception.py:1068
 #, python-format
 msgid "Failed to set admin password on %(instance)s because %(reason)s"
 msgstr ""
 
-#: nova/exception.py:1072
+#: nova/exception.py:1074
 #, python-format
 msgid "Detected existing vlan with id %(vlan)d"
 msgstr ""
 
-#: nova/exception.py:1076
+#: nova/exception.py:1078
 msgid "There was a conflict when trying to complete your request."
 msgstr ""
 
-#: nova/exception.py:1081
+#: nova/exception.py:1083
 #, python-format
 msgid "Instance %(instance_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1085
+#: nova/exception.py:1087
 #, python-format
 msgid "Info cache for instance %(instance_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1090
+#: nova/exception.py:1092
 #, python-format
 msgid "Node %(node_id)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1094
+#: nova/exception.py:1096
 #, python-format
 msgid "Node with UUID %(node_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1098
+#: nova/exception.py:1100
 #, python-format
 msgid "Marker %(marker)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1102
+#: nova/exception.py:1104
 #, python-format
 msgid "Invalid id: %(val)s (expecting \"i-...\")."
 msgstr ""
 
-#: nova/exception.py:1106
+#: nova/exception.py:1108
 #, python-format
 msgid "Could not fetch image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1110
+#: nova/exception.py:1112
 #, python-format
 msgid "Could not upload image %(image_id)s"
 msgstr ""
 
-#: nova/exception.py:1114
+#: nova/exception.py:1116
 #, python-format
 msgid "Task %(task_name)s is already running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1118
+#: nova/exception.py:1120
 #, python-format
 msgid "Task %(task_name)s is not running on host %(host)s"
 msgstr ""
 
-#: nova/exception.py:1122
+#: nova/exception.py:1124
 #, python-format
 msgid "Instance %(instance_uuid)s is locked"
 msgstr ""
 
-#: nova/exception.py:1126
+#: nova/exception.py:1128
 #, python-format
 msgid "Could not mount vfat config drive. %(operation)s failed. Error: %(error)s"
 msgstr ""
 
-#: nova/exception.py:1131
+#: nova/exception.py:1133
 #, python-format
 msgid "Unknown config drive format %(format)s. Select one of iso9660 or vfat."
 msgstr ""
 
-#: nova/exception.py:1136
+#: nova/exception.py:1138
 #, fuzzy, python-format
 msgid "Failed to attach network adapter device to %(instance)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/exception.py:1140
+#: nova/exception.py:1142
 #, python-format
 msgid "Failed to detach network adapter device from  %(instance)s"
 msgstr ""
 
-#: nova/exception.py:1144
+#: nova/exception.py:1146
 #, python-format
 msgid ""
 "User data too large. User data must be no larger than %(maxsize)s bytes "
 "once base64 encoded. Your data is %(length)d bytes"
 msgstr ""
 
-#: nova/exception.py:1150
+#: nova/exception.py:1152
 msgid "User data needs to be valid base 64."
 msgstr ""
 
-#: nova/exception.py:1154
+#: nova/exception.py:1156
 #, python-format
 msgid ""
 "unexpected task state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1159
+#: nova/exception.py:1161
 #, python-format
 msgid ""
 "Action for request_id %(request_id)s on instance %(instance_uuid)s not "
 "found"
 msgstr ""
 
-#: nova/exception.py:1164
+#: nova/exception.py:1166
 #, python-format
 msgid "Event %(event)s not found for action id %(action_id)s"
 msgstr ""
 
-#: nova/exception.py:1168
+#: nova/exception.py:1170
 #, python-format
 msgid ""
 "unexpected VM state: expecting %(expected)s but the actual state is "
 "%(actual)s"
 msgstr ""
 
-#: nova/exception.py:1173
+#: nova/exception.py:1175
 #, python-format
 msgid "The CA file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1177
+#: nova/exception.py:1179
 #, python-format
 msgid "The CRL file for %(project)s could not be found"
 msgstr ""
 
-#: nova/exception.py:1181
+#: nova/exception.py:1183
 msgid "Instance recreate is not implemented by this virt driver."
 msgstr ""
 
-#: nova/exception.py:1185
+#: nova/exception.py:1187
 #, python-format
 msgid ""
 "The service from servicegroup driver %(driver)s is temporarily "
 "unavailable."
 msgstr ""
 
-#: nova/exception.py:1190
+#: nova/exception.py:1192
 #, python-format
 msgid "%(binary)s attempted direct database access which is not allowed by policy"
 msgstr ""
 
-#: nova/exception.py:1195
+#: nova/exception.py:1197
 #, python-format
 msgid "Virtualization type '%(virt)s' is not supported by this compute driver"
 msgstr ""
 
-#: nova/exception.py:1200
+#: nova/exception.py:1202
 #, python-format
 msgid ""
 "Requested hardware '%(model)s' is not supported by the '%(virt)s' virt "
 "driver"
 msgstr ""
 
-#: nova/exception.py:1205
+#: nova/exception.py:1207
 #, python-format
 msgid "Invalid Base 64 data for file %(path)s"
 msgstr ""
 
-#: nova/exception.py:1209
+#: nova/exception.py:1211
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s aborted: %(reason)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:1213
+#: nova/exception.py:1215
 #, fuzzy, python-format
 msgid "Build of instance %(instance_uuid)s was re-scheduled: %(reason)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/exception.py:1218
+#: nova/exception.py:1220
 #, python-format
 msgid "Shadow table with name %(name)s already exists."
 msgstr ""
 
-#: nova/exception.py:1223
+#: nova/exception.py:1225
 #, python-format
 msgid "Instance rollback performed due to: %s"
 msgstr ""
 
-#: nova/exception.py:1229
+#: nova/exception.py:1231
 #, python-format
 msgid "Unsupported object type %(objtype)s"
 msgstr ""
 
-#: nova/exception.py:1233
+#: nova/exception.py:1235
 #, python-format
 msgid "Cannot call %(method)s on orphaned %(objtype)s object"
 msgstr ""
 
-#: nova/exception.py:1237
+#: nova/exception.py:1239
 #, python-format
 msgid "Version %(objver)s of %(objname)s is not supported"
 msgstr ""
 
-#: nova/exception.py:1241
+#: nova/exception.py:1243
 #, python-format
 msgid "Core API extensions are missing: %(missing_apis)s"
 msgstr ""
 
-#: nova/exception.py:1245
+#: nova/exception.py:1247
+#, python-format
+msgid "Error during following call to agent: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1251
+#, python-format
+msgid "Unable to contact guest agent. The following call timed out: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1256
+#, python-format
+msgid "Agent does not support the call: %(method)s"
+msgstr ""
+
+#: nova/exception.py:1260
 #, python-format
 msgid "Instance group %(group_uuid)s could not be found."
 msgstr ""
 
-#: nova/exception.py:1249
+#: nova/exception.py:1264
 #, python-format
 msgid "Instance group %(group_uuid)s already exists."
 msgstr ""
 
-#: nova/exception.py:1253
+#: nova/exception.py:1268
 #, python-format
 msgid "Instance group %(group_uuid)s has no metadata with key %(metadata_key)s."
 msgstr ""
 
-#: nova/exception.py:1258
+#: nova/exception.py:1273
 #, python-format
 msgid "Instance group %(group_uuid)s has no member with id %(instance_id)s."
 msgstr ""
 
-#: nova/exception.py:1263
+#: nova/exception.py:1278
 #, python-format
 msgid "Instance group %(group_uuid)s has no policy %(policy)s."
 msgstr ""
@@ -1369,15 +1384,15 @@ msgstr ""
 msgid "Running %(name)s post-hook: %(obj)s"
 msgstr ""
 
-#: nova/manager.py:172
+#: nova/manager.py:162
 msgid "Notifying Schedulers of capabilities ..."
 msgstr ""
 
-#: nova/notifications.py:112 nova/notifications.py:152
+#: nova/notifications.py:116 nova/notifications.py:156
 msgid "Failed to send state update notification"
 msgstr ""
 
-#: nova/notifications.py:233
+#: nova/notifications.py:241
 msgid "Failed to get nw_info"
 msgstr ""
 
@@ -1399,17 +1414,17 @@ msgstr ""
 msgid "Failed to commit reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:996
+#: nova/quota.py:997
 #, python-format
 msgid "Committed reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1016
+#: nova/quota.py:1017
 #, python-format
 msgid "Failed to roll back reservations %(reservations)s"
 msgstr ""
 
-#: nova/quota.py:1018
+#: nova/quota.py:1020
 #, python-format
 msgid "Rolled back reservations %(reservations)s"
 msgstr ""
@@ -1710,261 +1725,261 @@ msgstr ""
 msgid "Unsupported API request: controller = %(controller)s, action = %(action)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:402
+#: nova/api/ec2/cloud.py:401
 #, python-format
 msgid "Create snapshot of volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:427
+#: nova/api/ec2/cloud.py:426
 #, python-format
 msgid "Could not find key pair(s): %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:444
+#: nova/api/ec2/cloud.py:443
 #, python-format
 msgid "Create key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:451 nova/api/ec2/cloud.py:470
+#: nova/api/ec2/cloud.py:450 nova/api/ec2/cloud.py:469
 #: nova/api/openstack/compute/contrib/keypairs.py:93
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:94
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:95
 msgid "Quota exceeded, too many key pairs."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:460
+#: nova/api/ec2/cloud.py:459
 #, python-format
 msgid "Import key %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:480
+#: nova/api/ec2/cloud.py:479
 #, python-format
 msgid "Delete key pair %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:622 nova/api/ec2/cloud.py:742
+#: nova/api/ec2/cloud.py:621 nova/api/ec2/cloud.py:741
 msgid "Not enough parameters, need group_name or group_id"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:627
+#: nova/api/ec2/cloud.py:626
 #, python-format
 msgid "%s Not enough parameters to build a valid rule"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:634
+#: nova/api/ec2/cloud.py:633
 #, python-format
 msgid "Invalid IP protocol %s."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:664 nova/api/ec2/cloud.py:696
+#: nova/api/ec2/cloud.py:663 nova/api/ec2/cloud.py:695
 msgid "No rule for the specified parameters."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:687
+#: nova/api/ec2/cloud.py:686
 #, python-format
 msgid "%s - This rule already exists in group"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:770
+#: nova/api/ec2/cloud.py:769
 #, python-format
 msgid "Get console output for instance %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:841
+#: nova/api/ec2/cloud.py:840
 #, python-format
 msgid "Create volume from snapshot %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:845 nova/api/openstack/compute/contrib/volumes.py:242
+#: nova/api/ec2/cloud.py:844 nova/api/openstack/compute/contrib/volumes.py:242
 #, python-format
 msgid "Create volume of %s GB"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:872
+#: nova/api/ec2/cloud.py:871
 msgid "Delete Failed"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:885
+#: nova/api/ec2/cloud.py:884
 #, python-format
 msgid "Attach volume %(volume_id)s to instance %(instance_id)s at %(device)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:896
+#: nova/api/ec2/cloud.py:895
 msgid "Attach Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:918 nova/api/openstack/compute/contrib/volumes.py:445
+#: nova/api/ec2/cloud.py:917 nova/api/openstack/compute/contrib/volumes.py:445
 #, python-format
 msgid "Detach volume %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:925
+#: nova/api/ec2/cloud.py:924
 msgid "Detach Volume Failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:951 nova/api/ec2/cloud.py:1008
-#: nova/api/ec2/cloud.py:1574 nova/api/ec2/cloud.py:1589
+#: nova/api/ec2/cloud.py:950 nova/api/ec2/cloud.py:1007
+#: nova/api/ec2/cloud.py:1573 nova/api/ec2/cloud.py:1588
 #, python-format
 msgid "attribute not supported: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1083
+#: nova/api/ec2/cloud.py:1082
 #, python-format
 msgid "vol = %s\n"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1243
+#: nova/api/ec2/cloud.py:1242
 msgid "Allocate address"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1247
+#: nova/api/ec2/cloud.py:1246
 msgid "No more floating IPs available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1251
+#: nova/api/ec2/cloud.py:1250
 #, python-format
 msgid "Release address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1256
+#: nova/api/ec2/cloud.py:1255
 msgid "Unable to release IP Address."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1259
+#: nova/api/ec2/cloud.py:1258
 #, python-format
 msgid "Associate address %(public_ip)s to instance %(instance_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1269
+#: nova/api/ec2/cloud.py:1268
 msgid "Unable to associate IP Address, no fixed_ips."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1277
+#: nova/api/ec2/cloud.py:1276
 #: nova/api/openstack/compute/contrib/floating_ips.py:248
 #, python-format
 msgid "multiple fixed_ips exist, using the first: %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1286
+#: nova/api/ec2/cloud.py:1285
 msgid "Floating ip is already associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1289
+#: nova/api/ec2/cloud.py:1288
 msgid "l3driver call to add floating ip failed."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1292
+#: nova/api/ec2/cloud.py:1291
 msgid "Error, unable to associate floating ip."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1300
+#: nova/api/ec2/cloud.py:1299
 #, python-format
 msgid "Disassociate address %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1305
+#: nova/api/ec2/cloud.py:1304
 msgid "Floating ip is not associated."
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1308
+#: nova/api/ec2/cloud.py:1307
 #: nova/api/openstack/compute/contrib/floating_ips.py:97
 msgid "Cannot disassociate auto assigned floating ip"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1335
+#: nova/api/ec2/cloud.py:1334
 msgid "Image must be available"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1373
+#: nova/api/ec2/cloud.py:1372
 msgid "Going to start terminating instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1383
+#: nova/api/ec2/cloud.py:1382
 #, python-format
 msgid "Reboot instance %r"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1393
+#: nova/api/ec2/cloud.py:1392
 msgid "Going to stop instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1403
+#: nova/api/ec2/cloud.py:1402
 msgid "Going to start instances"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1494
+#: nova/api/ec2/cloud.py:1493
 #, python-format
 msgid "De-registering image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1510
+#: nova/api/ec2/cloud.py:1509
 msgid "imageLocation is required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1529
+#: nova/api/ec2/cloud.py:1528
 #, python-format
 msgid "Registered image %(image_location)s with id %(image_id)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1592
+#: nova/api/ec2/cloud.py:1591
 msgid "user or group not specified"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1594
+#: nova/api/ec2/cloud.py:1593
 msgid "only group \"all\" is supported"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1596
+#: nova/api/ec2/cloud.py:1595
 msgid "operation_type must be add or remove"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1598
+#: nova/api/ec2/cloud.py:1597
 #, python-format
 msgid "Updating image %s publicity"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1611
+#: nova/api/ec2/cloud.py:1610
 #, python-format
 msgid "Not allowed to modify attributes for image %s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1639
+#: nova/api/ec2/cloud.py:1638
 #, python-format
 msgid ""
 "Invalid value '%(ec2_instance_id)s' for instanceId. Instance does not "
 "have a volume attached at root (%(root)s)"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1671
+#: nova/api/ec2/cloud.py:1670
 #, python-format
 msgid "Couldn't stop instance with in %d sec"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1689
+#: nova/api/ec2/cloud.py:1688
 #, python-format
 msgid "image of %(instance)s at %(now)s"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1714 nova/api/ec2/cloud.py:1759
+#: nova/api/ec2/cloud.py:1713 nova/api/ec2/cloud.py:1758
 msgid "resource_id and tag are required"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1717 nova/api/ec2/cloud.py:1762
+#: nova/api/ec2/cloud.py:1716 nova/api/ec2/cloud.py:1761
 msgid "Expecting a list of resources"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1721 nova/api/ec2/cloud.py:1766
+#: nova/api/ec2/cloud.py:1720 nova/api/ec2/cloud.py:1765
 msgid "Only instances implemented"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1724 nova/api/ec2/cloud.py:1769
+#: nova/api/ec2/cloud.py:1723 nova/api/ec2/cloud.py:1768
 msgid "Expecting a list of tagSets"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1781
+#: nova/api/ec2/cloud.py:1780
 msgid "Expecting key to be set"
 msgstr ""
 
-#: nova/api/ec2/cloud.py:1854
+#: nova/api/ec2/cloud.py:1853
 msgid "Invalid CIDR"
 msgstr ""
 
@@ -2135,89 +2150,107 @@ msgstr ""
 msgid "Invalid image metadata"
 msgstr ""
 
-#: nova/api/openstack/common.py:362
+#: nova/api/openstack/common.py:363
 #, python-format
 msgid "Cannot '%(action)s' while instance is in %(attr)s %(state)s"
 msgstr ""
 
 #: nova/api/openstack/common.py:366
 #, python-format
+msgid "Cannot '%s' an instance which has never been active"
+msgstr ""
+
+#: nova/api/openstack/common.py:369
+#, python-format
 msgid "Instance is in an invalid state for '%s'"
 msgstr ""
 
-#: nova/api/openstack/common.py:446
+#: nova/api/openstack/common.py:449
 msgid "Rejecting snapshot request, snapshots currently disabled"
 msgstr ""
 
-#: nova/api/openstack/common.py:448
+#: nova/api/openstack/common.py:451
 msgid "Instance snapshots are not permitted at this time."
 msgstr ""
 
-#: nova/api/openstack/extensions.py:196
+#: nova/api/openstack/extensions.py:197
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:235
+#: nova/api/openstack/extensions.py:236
 #: nova/api/openstack/compute/plugins/__init__.py:46
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:236
+#: nova/api/openstack/extensions.py:237
 #: nova/api/openstack/compute/plugins/__init__.py:47
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:237
+#: nova/api/openstack/extensions.py:238
 #: nova/api/openstack/compute/plugins/__init__.py:48
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:239
+#: nova/api/openstack/extensions.py:240
 #: nova/api/openstack/compute/plugins/__init__.py:50
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:240
+#: nova/api/openstack/extensions.py:241
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:242
+#: nova/api/openstack/extensions.py:243
 #: nova/api/openstack/compute/plugins/__init__.py:53
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:256
+#: nova/api/openstack/extensions.py:257
 #, python-format
 msgid "Loading extension %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:265
+#: nova/api/openstack/extensions.py:266
 #, python-format
 msgid "Calling extension factory %s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:277
+#: nova/api/openstack/extensions.py:278
 #, python-format
 msgid "Failed to load extension %(ext_factory)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:348
+#: nova/api/openstack/extensions.py:349
 #, python-format
 msgid "Failed to load extension %(classpath)s: %(exc)s"
 msgstr ""
 
-#: nova/api/openstack/extensions.py:371
+#: nova/api/openstack/extensions.py:372
 #, python-format
 msgid "Failed to load extension %(ext_name)s:%(exc)s"
 msgstr ""
 
+#: nova/api/openstack/extensions.py:485
+msgid "Unexpected exception in API method"
+msgstr ""
+
+#: nova/api/openstack/extensions.py:486
+#, python-format
+msgid ""
+"Unexpected API Error. Please report this at "
+"http://bugs.launchpad.net/nova/ and attach the Nova API log if possible."
+"\n"
+"%s"
+msgstr ""
+
 #: nova/api/openstack/wsgi.py:208 nova/api/openstack/wsgi.py:626
 msgid "cannot understand JSON"
 msgstr ""
@@ -2265,6 +2298,7 @@ msgstr ""
 #: nova/api/openstack/compute/server_metadata.py:126
 #: nova/api/openstack/compute/contrib/admin_actions.py:211
 #: nova/api/openstack/compute/contrib/evacuate.py:47
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:48
 msgid "Malformed request body"
 msgstr ""
 
@@ -2311,7 +2345,7 @@ msgstr ""
 msgid "subclasses must implement construct()!"
 msgstr ""
 
-#: nova/api/openstack/compute/extensions.py:39
+#: nova/api/openstack/compute/extensions.py:38
 msgid "Initializing extension manager."
 msgstr ""
 
@@ -2654,9 +2688,9 @@ msgstr ""
 
 #: nova/api/openstack/compute/servers.py:1228
 #: nova/api/openstack/compute/contrib/aggregates.py:143
-#: nova/api/openstack/compute/contrib/coverage_ext.py:284
+#: nova/api/openstack/compute/contrib/coverage_ext.py:285
 #: nova/api/openstack/compute/contrib/keypairs.py:78
-#: nova/api/openstack/compute/plugins/v3/keypairs.py:79
+#: nova/api/openstack/compute/plugins/v3/keypairs.py:80
 #: nova/api/openstack/compute/plugins/v3/servers.py:1316
 msgid "Invalid request body"
 msgstr ""
@@ -2718,6 +2752,7 @@ msgstr ""
 #: nova/api/openstack/compute/contrib/admin_actions.py:321
 #: nova/api/openstack/compute/contrib/multinic.py:41
 #: nova/api/openstack/compute/contrib/rescue.py:42
+#: nova/api/openstack/compute/plugins/v3/rescue.py:43
 msgid "Server not found"
 msgstr ""
 
@@ -2879,7 +2914,8 @@ msgstr ""
 msgid "Only 'updated_since' and 'project_id' are understood."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/certificates.py:71
+#: nova/api/openstack/compute/contrib/certificates.py:62
+#: nova/api/openstack/compute/plugins/v3/certificates.py:63
 msgid "Only root certificate can be retrieved."
 msgstr ""
 
@@ -2920,33 +2956,33 @@ msgstr ""
 msgid "Coverage begin"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:163
+#: nova/api/openstack/compute/contrib/coverage_ext.py:164
 msgid "Coverage not running"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:192
+#: nova/api/openstack/compute/contrib/coverage_ext.py:193
 #, fuzzy
 msgid "Invalid path"
 msgstr "無效的快照(snapshot)"
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:196
+#: nova/api/openstack/compute/contrib/coverage_ext.py:197
 msgid "No path given for report file"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:203
+#: nova/api/openstack/compute/contrib/coverage_ext.py:204
 msgid "You can't use html reports without combining"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:216
+#: nova/api/openstack/compute/contrib/coverage_ext.py:217
 #, python-format
 msgid "Directory conflict: %s already exists"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:274
+#: nova/api/openstack/compute/contrib/coverage_ext.py:275
 msgid "Python coverage module is not installed."
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/coverage_ext.py:282
+#: nova/api/openstack/compute/contrib/coverage_ext.py:283
 #, python-format
 msgid "Coverage doesn't have %s action"
 msgstr ""
@@ -2957,26 +2993,29 @@ msgid "%s must be either 'MANUAL' or 'AUTO'."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:59
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:60
 msgid "admin password can't be changed on existing disk"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:67
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:68
 msgid "host and onSharedStorage must be specified."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/evacuate.py:78
+#: nova/api/openstack/compute/plugins/v3/evacuate.py:79
 #, python-format
 msgid "Error in evacuate, %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:40
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:43
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:44
 #, python-format
 msgid "Fixed IP %s has been deleted"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/fixed_ips.py:73
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:77
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:79
 #, python-format
 msgid "Fixed IP %s not found"
 msgstr ""
@@ -3024,7 +3063,7 @@ msgstr ""
 
 #: nova/api/openstack/compute/contrib/floating_ips.py:216
 #: nova/api/openstack/compute/contrib/floating_ips.py:281
-#: nova/api/openstack/compute/contrib/security_groups.py:445
+#: nova/api/openstack/compute/contrib/security_groups.py:457
 msgid "Missing parameter dict"
 msgstr ""
 
@@ -3263,30 +3302,36 @@ msgid "Create networks failed"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:71
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:75
 msgid "Quota limit must be -1 or greater."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:123
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:127
 #, python-format
 msgid "Quota '%(value)s' for %(key)s should be integer."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:129
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:133
 #, python-format
 msgid "force update quotas: %s"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:132
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:136
 #, python-format
 msgid "Bad key(s) %s in quota_set"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:152
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:156
 #, python-format
 msgid "Quota %(key)s used: %(quota_used)s, value: %(value)s."
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/quotas.py:157
+#: nova/api/openstack/compute/plugins/v3/quota_sets.py:161
 #, python-format
 msgid ""
 "Quota value %(value)s for %(key)s are greater than already used and "
@@ -3298,7 +3343,7 @@ msgid "Malformed scheduler_hints attribute"
 msgstr ""
 
 #: nova/api/openstack/compute/contrib/security_group_default_rules.py:129
-#: nova/api/openstack/compute/contrib/security_groups.py:352
+#: nova/api/openstack/compute/contrib/security_groups.py:371
 msgid "Not enough parameters to build a valid rule."
 msgstr ""
 
@@ -3315,16 +3360,16 @@ msgstr ""
 msgid "security group default rule not found"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:360
+#: nova/api/openstack/compute/contrib/security_groups.py:379
 #, python-format
 msgid "Bad prefix for network in cidr %s"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:448
+#: nova/api/openstack/compute/contrib/security_groups.py:460
 msgid "Security group not specified"
 msgstr ""
 
-#: nova/api/openstack/compute/contrib/security_groups.py:452
+#: nova/api/openstack/compute/contrib/security_groups.py:464
 msgid "Security group name cannot be empty"
 msgstr ""
 
@@ -3407,12 +3452,17 @@ msgstr ""
 msgid "Ext version: %i"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:62
+#: nova/api/openstack/compute/plugins/v3/extension_info.py:81
+#, python-format
+msgid "Filter out extension %s from discover list"
+msgstr ""
+
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:64
 #, python-format
 msgid "Reserving IP address %s"
 msgstr ""
 
-#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:65
+#: nova/api/openstack/compute/plugins/v3/fixed_ips.py:67
 #, python-format
 msgid "Unreserving IP address %s"
 msgstr ""
@@ -3495,39 +3545,39 @@ msgstr ""
 msgid "Received capacities from child cell %(cell_name)s: %(capacities)s"
 msgstr ""
 
-#: nova/cells/messaging.py:823
+#: nova/cells/messaging.py:821
 #, fuzzy, python-format
 msgid "Got update for instance: %(instance)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/cells/messaging.py:866
+#: nova/cells/messaging.py:864
 #, fuzzy
 msgid "Got update to delete instance"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/cells/messaging.py:881
+#: nova/cells/messaging.py:879
 #, python-format
 msgid "Got broadcast to %(delete_type)s delete instance"
 msgstr ""
 
-#: nova/cells/messaging.py:895
+#: nova/cells/messaging.py:893
 #, python-format
 msgid "Got message to create instance fault: %(instance_fault)s"
 msgstr ""
 
-#: nova/cells/messaging.py:916
+#: nova/cells/messaging.py:914
 #, python-format
 msgid ""
 "Forcing a sync of instances, project_id=%(projid_str)s, "
 "updated_since=%(since_str)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1101
+#: nova/cells/messaging.py:1099
 #, python-format
 msgid "Updating parents with our capabilities: %(capabs)s"
 msgstr ""
 
-#: nova/cells/messaging.py:1121
+#: nova/cells/messaging.py:1119
 #, python-format
 msgid "Updating parents with our capacities: %(capacities)s"
 msgstr ""
@@ -3542,28 +3592,28 @@ msgstr ""
 msgid "Scheduling with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:204
+#: nova/cells/scheduler.py:165 nova/cells/scheduler.py:205
 #, python-format
 msgid "Couldn't communicate with cell '%s'"
 msgstr ""
 
-#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:208
+#: nova/cells/scheduler.py:169 nova/cells/scheduler.py:209
 msgid "Couldn't communicate with any cells"
 msgstr ""
 
-#: nova/cells/scheduler.py:183
+#: nova/cells/scheduler.py:184
 #, python-format
 msgid "Building instances with routing_path=%(routing_path)s"
 msgstr ""
 
-#: nova/cells/scheduler.py:252
+#: nova/cells/scheduler.py:254
 #, python-format
 msgid ""
 "No cells available when scheduling.  Will retry in %(sleep_time)s "
 "second(s)"
 msgstr ""
 
-#: nova/cells/scheduler.py:258
+#: nova/cells/scheduler.py:260
 #, python-format
 msgid "Error scheduling instances %(instance_uuids)s"
 msgstr ""
@@ -3622,17 +3672,17 @@ msgstr ""
 msgid "Failed to load %s"
 msgstr "找�到Volume %s"
 
-#: nova/cmd/baremetal_deploy_helper.py:243
+#: nova/cmd/baremetal_deploy_helper.py:244
 #, python-format
 msgid "start deployment for node %(node_id)s, params %(params)s"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:251
+#: nova/cmd/baremetal_deploy_helper.py:252
 #, python-format
 msgid "deployment to node %s failed"
 msgstr ""
 
-#: nova/cmd/baremetal_deploy_helper.py:255
+#: nova/cmd/baremetal_deploy_helper.py:256
 #, python-format
 msgid "deployment to node %s done"
 msgstr ""
@@ -3990,246 +4040,246 @@ msgstr ""
 msgid "cell_type must be configured as 'api' or 'compute'"
 msgstr ""
 
-#: nova/compute/api.py:293
+#: nova/compute/api.py:302
 msgid "Cannot run any more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:300
+#: nova/compute/api.py:309
 #, python-format
 msgid "Can only run %s more instances of this type."
 msgstr ""
 
-#: nova/compute/api.py:309
+#: nova/compute/api.py:318
 #, python-format
 msgid ""
 "%(overs)s quota exceeded for %(pid)s, tried to run %(min_count)s "
 "instances. %(msg)s"
 msgstr ""
 
-#: nova/compute/api.py:329
+#: nova/compute/api.py:338
 #, python-format
 msgid ""
 "Quota exceeded for %(pid)s, tried to set %(num_metadata)s metadata "
 "properties"
 msgstr ""
 
-#: nova/compute/api.py:339
+#: nova/compute/api.py:348
 msgid "Metadata property key blank"
 msgstr ""
 
-#: nova/compute/api.py:343
+#: nova/compute/api.py:352
 msgid "Metadata property key greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:347
+#: nova/compute/api.py:356
 msgid "Metadata property value greater than 255 characters"
 msgstr ""
 
-#: nova/compute/api.py:480
+#: nova/compute/api.py:489
 msgid "Failed to set instance name using multi_instance_display_name_template."
 msgstr ""
 
-#: nova/compute/api.py:563
+#: nova/compute/api.py:572
 #, fuzzy
 msgid "Cannot attach one or more volumes to multiple instances"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/api.py:661
+#: nova/compute/api.py:670
 #, python-format
 msgid "Going to run %s instances..."
 msgstr ""
 
-#: nova/compute/api.py:806
+#: nova/compute/api.py:815
 #, python-format
 msgid "bdm %s"
 msgstr ""
 
-#: nova/compute/api.py:833
+#: nova/compute/api.py:842
 #, python-format
 msgid "block_device_mapping %s"
 msgstr ""
 
-#: nova/compute/api.py:1116
+#: nova/compute/api.py:1125
 #, fuzzy
 msgid "instance termination disabled"
 msgstr "建立虛擬介�失敗"
 
-#: nova/compute/api.py:1252
+#: nova/compute/api.py:1261
 #, python-format
 msgid "instance type %(old_inst_type_id)d not found"
 msgstr ""
 
-#: nova/compute/api.py:1258
+#: nova/compute/api.py:1267
 msgid "going to delete a resizing instance"
 msgstr ""
 
-#: nova/compute/api.py:1268
+#: nova/compute/api.py:1277
 #, python-format
 msgid "instance's host %s is down, deleting from database"
 msgstr ""
 
-#: nova/compute/api.py:1311
+#: nova/compute/api.py:1321
 msgid "Going to try to soft delete instance"
 msgstr ""
 
-#: nova/compute/api.py:1335
+#: nova/compute/api.py:1346
 msgid "Going to try to terminate instance"
 msgstr ""
 
-#: nova/compute/api.py:1385
+#: nova/compute/api.py:1397
 msgid "Going to try to stop instance"
 msgstr ""
 
-#: nova/compute/api.py:1401
+#: nova/compute/api.py:1413
 msgid "Going to try to start instance"
 msgstr ""
 
-#: nova/compute/api.py:1473
+#: nova/compute/api.py:1485
 #, python-format
 msgid "Searching by: %s"
 msgstr ""
 
-#: nova/compute/api.py:1710
+#: nova/compute/api.py:1722
 #, python-format
 msgid "snapshot for %s"
 msgstr ""
 
-#: nova/compute/api.py:2046
+#: nova/compute/api.py:2060
 msgid "flavor_id is None. Assuming migration."
 msgstr ""
 
-#: nova/compute/api.py:2055
+#: nova/compute/api.py:2069
 #, python-format
 msgid ""
 "Old instance type %(current_instance_type_name)s,  new instance type "
 "%(new_instance_type_name)s"
 msgstr ""
 
-#: nova/compute/api.py:2103
+#: nova/compute/api.py:2117
 #, python-format
 msgid "%(overs)s quota exceeded for %(pid)s, tried to resize instance."
 msgstr ""
 
-#: nova/compute/api.py:2241
+#: nova/compute/api.py:2256
 msgid "Cannot rescue a volume-backed instance"
 msgstr ""
 
-#: nova/compute/api.py:2346
+#: nova/compute/api.py:2361
 msgid "Locking"
 msgstr ""
 
-#: nova/compute/api.py:2354
+#: nova/compute/api.py:2369
 msgid "Unlocking"
 msgstr ""
 
-#: nova/compute/api.py:2426
+#: nova/compute/api.py:2441
 msgid "Volume must be attached in order to detach."
 msgstr ""
 
-#: nova/compute/api.py:2540
+#: nova/compute/api.py:2555
 #, python-format
 msgid "Going to try to live migrate instance to %s"
 msgstr ""
 
-#: nova/compute/api.py:2562
+#: nova/compute/api.py:2577
 msgid "vm evacuation scheduled"
 msgstr ""
 
-#: nova/compute/api.py:2566
+#: nova/compute/api.py:2581
 #, python-format
 msgid ""
 "Instance compute service state on %(inst_host)s expected to be down, but "
 "it was up."
 msgstr ""
 
-#: nova/compute/api.py:2814 nova/tests/compute/test_keypairs.py:108
+#: nova/compute/api.py:2829 nova/tests/compute/test_keypairs.py:108
 msgid "Keypair name contains unsafe characters"
 msgstr ""
 
-#: nova/compute/api.py:2818 nova/tests/compute/test_keypairs.py:100
+#: nova/compute/api.py:2833 nova/tests/compute/test_keypairs.py:100
 #: nova/tests/compute/test_keypairs.py:104
 msgid "Keypair name must be between 1 and 255 characters long"
 msgstr ""
 
-#: nova/compute/api.py:2900
+#: nova/compute/api.py:2915
 #, python-format
 msgid "Security group %s is not a string or unicode"
 msgstr ""
 
-#: nova/compute/api.py:2903
+#: nova/compute/api.py:2918
 #, python-format
 msgid "Security group %s cannot be empty."
 msgstr ""
 
-#: nova/compute/api.py:2911
+#: nova/compute/api.py:2926
 #, python-format
 msgid ""
 "Value (%(value)s) for parameter Group%(property)s is invalid. Content "
 "limited to '%(allowed)'."
 msgstr ""
 
-#: nova/compute/api.py:2917
+#: nova/compute/api.py:2932
 #, python-format
 msgid "Security group %s should not be greater than 255 characters."
 msgstr ""
 
-#: nova/compute/api.py:2935
+#: nova/compute/api.py:2950
 msgid "Quota exceeded, too many security groups."
 msgstr ""
 
-#: nova/compute/api.py:2938
+#: nova/compute/api.py:2953
 #, python-format
 msgid "Create Security Group %s"
 msgstr ""
 
-#: nova/compute/api.py:2945
+#: nova/compute/api.py:2960
 #, python-format
 msgid "Security group %s already exists"
 msgstr ""
 
-#: nova/compute/api.py:2964
+#: nova/compute/api.py:2979
 #, fuzzy, python-format
 msgid "Unable to update system group '%s'"
 msgstr "找�到Volume %s"
 
-#: nova/compute/api.py:3024
+#: nova/compute/api.py:3039
 #, fuzzy, python-format
 msgid "Unable to delete system group '%s'"
 msgstr "找�到Volume %s"
 
-#: nova/compute/api.py:3029
+#: nova/compute/api.py:3044
 msgid "Security group is still in use"
 msgstr ""
 
-#: nova/compute/api.py:3037
+#: nova/compute/api.py:3052
 msgid "Failed to update usages deallocating security group"
 msgstr ""
 
-#: nova/compute/api.py:3040
+#: nova/compute/api.py:3055
 #, python-format
 msgid "Delete security group %s"
 msgstr ""
 
-#: nova/compute/api.py:3117 nova/compute/api.py:3191
+#: nova/compute/api.py:3132 nova/compute/api.py:3206
 #, python-format
 msgid "Rule (%s) not found"
 msgstr ""
 
-#: nova/compute/api.py:3133
+#: nova/compute/api.py:3148
 msgid "Quota exceeded, too many security group rules."
 msgstr ""
 
-#: nova/compute/api.py:3136
+#: nova/compute/api.py:3151
 #, python-format
 msgid "Authorize security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3145
+#: nova/compute/api.py:3160
 #, python-format
 msgid "Revoke security group ingress %s"
 msgstr ""
 
-#: nova/compute/api.py:3198
+#: nova/compute/api.py:3213
 msgid "Security group id should be integer"
 msgstr ""
 
@@ -4293,12 +4343,12 @@ msgstr ""
 
 #: nova/compute/flavors.py:101
 #, python-format
-msgid "'%s' argument must be greater than 0"
+msgid "'%s' argument must be a positive integer"
 msgstr ""
 
 #: nova/compute/flavors.py:110
 #, python-format
-msgid "'%s' argument must be greater than or equal to 0"
+msgid "'%s' argument must be an integer greater than or equal to 0"
 msgstr ""
 
 #: nova/compute/flavors.py:119
@@ -4323,656 +4373,656 @@ msgstr ""
 msgid "Possibly task preempted."
 msgstr ""
 
-#: nova/compute/manager.py:379
+#: nova/compute/manager.py:380
 #, python-format
 msgid "%s is not a valid node managed by this compute host."
 msgstr ""
 
-#: nova/compute/manager.py:407
+#: nova/compute/manager.py:408
 msgid "Instance has been destroyed from under us while trying to set it to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:456
+#: nova/compute/manager.py:457
 #, python-format
 msgid ""
 "Deleting instance as its host (%(instance_host)s) is not equal to our "
 "host (%(our_host)s)."
 msgstr ""
 
-#: nova/compute/manager.py:472
+#: nova/compute/manager.py:473
 msgid "Instance has been marked deleted already, removing it from the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:493
+#: nova/compute/manager.py:494
 msgid ""
 "Hypervisor driver does not support instance shared storage check, "
 "assuming it's not on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:499
+#: nova/compute/manager.py:500
 msgid "Failed to check if instance shared"
 msgstr ""
 
-#: nova/compute/manager.py:541
+#: nova/compute/manager.py:542
 #, python-format
 msgid ""
 "Error raised getting network info for instance %(instance_uuid)s. "
 "Retrying in %(retry_time)s seconds."
 msgstr ""
 
-#: nova/compute/manager.py:567
+#: nova/compute/manager.py:568
 msgid "Failed to revert crashed migration"
 msgstr ""
 
-#: nova/compute/manager.py:570
+#: nova/compute/manager.py:571
 msgid "Instance found in migrating state during startup. Resetting task_state"
 msgstr ""
 
-#: nova/compute/manager.py:581
+#: nova/compute/manager.py:582
 #, python-format
 msgid "Current state is %(drv_state)s, state in DB is %(db_state)s."
 msgstr ""
 
-#: nova/compute/manager.py:587
+#: nova/compute/manager.py:588
 msgid "Rebooting instance after nova-compute restart."
 msgstr ""
 
-#: nova/compute/manager.py:601
+#: nova/compute/manager.py:602
 msgid "Hypervisor driver does not support resume guests"
 msgstr ""
 
-#: nova/compute/manager.py:606
+#: nova/compute/manager.py:607
 #, fuzzy
 msgid "Failed to resume instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:616
+#: nova/compute/manager.py:617
 msgid "Hypervisor driver does not support firewall rules"
 msgstr ""
 
-#: nova/compute/manager.py:620
+#: nova/compute/manager.py:621
 #, python-format
 msgid "Lifecycle event %(state)d on VM %(uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:636
+#: nova/compute/manager.py:637
 #, python-format
 msgid "Unexpected power state %d"
 msgstr ""
 
-#: nova/compute/manager.py:648
+#: nova/compute/manager.py:649
 #, python-format
 msgid "Ignoring event %s"
 msgstr ""
 
-#: nova/compute/manager.py:686
+#: nova/compute/manager.py:687
 msgid "Checking state"
 msgstr ""
 
-#: nova/compute/manager.py:784
+#: nova/compute/manager.py:785
 #, python-format
 msgid "Volume id: %s finished being created but was not set as 'available'"
 msgstr ""
 
-#: nova/compute/manager.py:801
+#: nova/compute/manager.py:802
 #, python-format
 msgid "Setting up bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:901
+#: nova/compute/manager.py:903
 msgid "Success"
 msgstr ""
 
-#: nova/compute/manager.py:924
+#: nova/compute/manager.py:926
 msgid "Instance disappeared before we could start it"
 msgstr ""
 
-#: nova/compute/manager.py:951 nova/compute/manager.py:2466
+#: nova/compute/manager.py:953 nova/compute/manager.py:2479
 #, python-format
 msgid "No node specified, defaulting to %s"
 msgstr ""
 
-#: nova/compute/manager.py:995
+#: nova/compute/manager.py:997
 msgid "Failed to dealloc network for deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:1004
+#: nova/compute/manager.py:1006
 msgid "Instance was deleted during spawn."
 msgstr ""
 
-#: nova/compute/manager.py:1035
+#: nova/compute/manager.py:1037
 #, python-format
 msgid "Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1052
+#: nova/compute/manager.py:1054
 msgid "Clean up resource before rescheduling."
 msgstr ""
 
-#: nova/compute/manager.py:1077 nova/compute/manager.py:2519
+#: nova/compute/manager.py:1079 nova/compute/manager.py:2532
 msgid "Error trying to reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1090
+#: nova/compute/manager.py:1092
 msgid "Retry info not present, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1095
+#: nova/compute/manager.py:1097
 msgid "No request spec, will not reschedule"
 msgstr ""
 
-#: nova/compute/manager.py:1101
+#: nova/compute/manager.py:1103
 #, python-format
 msgid "Re-scheduling %(method)s: attempt %(num)d"
 msgstr ""
 
-#: nova/compute/manager.py:1130
+#: nova/compute/manager.py:1132
 msgid "Instance build timed out. Set to error state."
 msgstr ""
 
-#: nova/compute/manager.py:1140
+#: nova/compute/manager.py:1142
 msgid "Starting instance..."
 msgstr ""
 
-#: nova/compute/manager.py:1164
+#: nova/compute/manager.py:1166
 msgid "Allocating IP information in the background."
 msgstr ""
 
-#: nova/compute/manager.py:1175
+#: nova/compute/manager.py:1177
 msgid "Instance failed network setup"
 msgstr ""
 
-#: nova/compute/manager.py:1177
+#: nova/compute/manager.py:1179
 #, python-format
 msgid "Instance network_info: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:1188
+#: nova/compute/manager.py:1190
 msgid "Instance failed block device setup"
 msgstr ""
 
-#: nova/compute/manager.py:1207
+#: nova/compute/manager.py:1209
 msgid "Instance failed to spawn"
 msgstr ""
 
-#: nova/compute/manager.py:1258
+#: nova/compute/manager.py:1260
 msgid "Deallocating network for instance"
 msgstr ""
 
-#: nova/compute/manager.py:1332
+#: nova/compute/manager.py:1334
 msgid "Failed to deallocate network for instance."
 msgstr ""
 
-#: nova/compute/manager.py:1339
+#: nova/compute/manager.py:1341
 #, python-format
 msgid "%(action_str)s instance"
 msgstr ""
 
-#: nova/compute/manager.py:1382
+#: nova/compute/manager.py:1384
 #, python-format
 msgid "Ignoring DiskNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1385
+#: nova/compute/manager.py:1387
 #, python-format
 msgid "Ignoring VolumeNotFound: %s"
 msgstr ""
 
-#: nova/compute/manager.py:1392
+#: nova/compute/manager.py:1394
 #, python-format
 msgid "terminating bdm %s"
 msgstr ""
 
-#: nova/compute/manager.py:1440
+#: nova/compute/manager.py:1442
 #, python-format
 msgid "Ignoring volume cleanup failure due to %s"
 msgstr ""
 
-#: nova/compute/manager.py:1502 nova/compute/manager.py:2701
-#: nova/compute/manager.py:4224
+#: nova/compute/manager.py:1504 nova/compute/manager.py:2714
+#: nova/compute/manager.py:4239
 #, python-format
 msgid "%s. Setting instance vm_state to ERROR"
 msgstr ""
 
-#: nova/compute/manager.py:1654
+#: nova/compute/manager.py:1668
 msgid "Rebuilding instance"
 msgstr ""
 
-#: nova/compute/manager.py:1667
+#: nova/compute/manager.py:1681
 msgid "Invalid state of instance files on shared storage"
 msgstr ""
 
-#: nova/compute/manager.py:1671
+#: nova/compute/manager.py:1685
 msgid "disk on shared storage, recreating using existing disk"
 msgstr ""
 
-#: nova/compute/manager.py:1675
+#: nova/compute/manager.py:1689
 #, python-format
 msgid "disk not on shared storagerebuilding from: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1758
+#: nova/compute/manager.py:1772
 #, python-format
 msgid "bringing vm to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:1790
+#: nova/compute/manager.py:1804
 #, fuzzy, python-format
 msgid "Detaching from volume api: %s"
 msgstr "無法�載 Volume %s"
 
-#: nova/compute/manager.py:1808
+#: nova/compute/manager.py:1822
 msgid "Rebooting instance"
 msgstr ""
 
-#: nova/compute/manager.py:1827
+#: nova/compute/manager.py:1841
 #, python-format
 msgid ""
 "trying to reboot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1863
+#: nova/compute/manager.py:1877
 msgid "Reboot failed but instance is running"
 msgstr ""
 
-#: nova/compute/manager.py:1866
+#: nova/compute/manager.py:1880
 #, python-format
 msgid "Cannot reboot instance: %(error)s"
 msgstr ""
 
-#: nova/compute/manager.py:1879
+#: nova/compute/manager.py:1893
 msgid "Instance disappeared during reboot"
 msgstr ""
 
-#: nova/compute/manager.py:1906
+#: nova/compute/manager.py:1920
 msgid "instance snapshotting"
 msgstr ""
 
-#: nova/compute/manager.py:1912
+#: nova/compute/manager.py:1926
 #, python-format
 msgid ""
 "trying to snapshot a non-running instance: (state: %(state)s expected: "
 "%(running)s)"
 msgstr ""
 
-#: nova/compute/manager.py:1973
+#: nova/compute/manager.py:1987
 #, python-format
 msgid "Found %(num_images)d images (rotation: %(rotation)d)"
 msgstr ""
 
-#: nova/compute/manager.py:1981
+#: nova/compute/manager.py:1995
 #, python-format
 msgid "Rotating out %d backups"
 msgstr ""
 
-#: nova/compute/manager.py:1986
+#: nova/compute/manager.py:2000
 #, python-format
 msgid "Deleting image %s"
 msgstr ""
 
-#: nova/compute/manager.py:2014
+#: nova/compute/manager.py:2028
 #, python-format
 msgid "Failed to set admin password. Instance %s is not running"
 msgstr ""
 
-#: nova/compute/manager.py:2021
+#: nova/compute/manager.py:2035
 msgid "Root password set"
 msgstr ""
 
-#: nova/compute/manager.py:2028
+#: nova/compute/manager.py:2042
 msgid "set_admin_password is not implemented by this driver or guest instance."
 msgstr ""
 
-#: nova/compute/manager.py:2043
+#: nova/compute/manager.py:2057
 #, python-format
 msgid "set_admin_password failed: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2050
+#: nova/compute/manager.py:2064
 msgid "error setting admin password"
 msgstr ""
 
-#: nova/compute/manager.py:2063
+#: nova/compute/manager.py:2077
 #, python-format
 msgid ""
 "trying to inject a file into a non-running (state: %(current_state)s "
 "expected: %(expected_state)s)"
 msgstr ""
 
-#: nova/compute/manager.py:2068
+#: nova/compute/manager.py:2082
 #, python-format
 msgid "injecting file to %s"
 msgstr ""
 
-#: nova/compute/manager.py:2088
+#: nova/compute/manager.py:2102
 msgid ""
 "Unable to find a different image to use for rescue VM, using instance's "
 "current image"
 msgstr ""
 
-#: nova/compute/manager.py:2101
+#: nova/compute/manager.py:2115
 msgid "Rescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2120
+#: nova/compute/manager.py:2134
 #, fuzzy
 msgid "Error trying to Rescue Instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:2124
+#: nova/compute/manager.py:2138
 #, python-format
 msgid "Driver Error: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2142
+#: nova/compute/manager.py:2156
 msgid "Unrescuing"
 msgstr ""
 
-#: nova/compute/manager.py:2163
+#: nova/compute/manager.py:2177
 #, python-format
 msgid "Changing instance metadata according to %r"
 msgstr ""
 
-#: nova/compute/manager.py:2385
+#: nova/compute/manager.py:2399
 #, python-format
 msgid "Updating instance to original state: '%s'"
 msgstr ""
 
-#: nova/compute/manager.py:2419
+#: nova/compute/manager.py:2433
 msgid "Instance has no source host"
 msgstr ""
 
-#: nova/compute/manager.py:2425
+#: nova/compute/manager.py:2439
 msgid "destination same as source!"
 msgstr ""
 
-#: nova/compute/manager.py:2447
+#: nova/compute/manager.py:2460
 msgid "Migrating"
 msgstr ""
 
-#: nova/compute/manager.py:2698
+#: nova/compute/manager.py:2711
 #, python-format
 msgid "Failed to rollback quota for failed finish_resize: %s"
 msgstr ""
 
-#: nova/compute/manager.py:2761
+#: nova/compute/manager.py:2774
 msgid "Pausing"
 msgstr ""
 
-#: nova/compute/manager.py:2779
+#: nova/compute/manager.py:2792
 msgid "Unpausing"
 msgstr ""
 
-#: nova/compute/manager.py:2818
+#: nova/compute/manager.py:2831
 msgid "Retrieving diagnostics"
 msgstr ""
 
-#: nova/compute/manager.py:2849
+#: nova/compute/manager.py:2862
 msgid "Resuming"
 msgstr ""
 
-#: nova/compute/manager.py:2869
+#: nova/compute/manager.py:2882
 msgid "Reset network"
 msgstr ""
 
-#: nova/compute/manager.py:2874
+#: nova/compute/manager.py:2887
 msgid "Inject network info"
 msgstr ""
 
-#: nova/compute/manager.py:2877
+#: nova/compute/manager.py:2890
 #, python-format
 msgid "network_info to inject: |%s|"
 msgstr ""
 
-#: nova/compute/manager.py:2894
+#: nova/compute/manager.py:2907
 msgid "Get console output"
 msgstr ""
 
-#: nova/compute/manager.py:2921
+#: nova/compute/manager.py:2934
 msgid "Getting vnc console"
 msgstr ""
 
-#: nova/compute/manager.py:2956
+#: nova/compute/manager.py:2969
 msgid "Getting spice console"
 msgstr ""
 
-#: nova/compute/manager.py:3004
+#: nova/compute/manager.py:3017
 #, python-format
 msgid "Booting with volume %(volume_id)s at %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3055
+#: nova/compute/manager.py:3068
 #, python-format
 msgid "Attaching volume %(volume_id)s to %(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3065
+#: nova/compute/manager.py:3078
 #, python-format
 msgid ""
 "Failed to connect to volume %(volume_id)s while attaching at "
 "%(mountpoint)s"
 msgstr ""
 
-#: nova/compute/manager.py:3081
+#: nova/compute/manager.py:3094
 #, 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:3112
+#: nova/compute/manager.py:3125
 #, python-format
 msgid "Detach volume %(volume_id)s from mountpoint %(mp)s"
 msgstr ""
 
-#: nova/compute/manager.py:3123
+#: nova/compute/manager.py:3136
 #, fuzzy
 msgid "Detaching volume from unknown instance"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/compute/manager.py:3130
+#: nova/compute/manager.py:3143
 #, 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:3154
+#: nova/compute/manager.py:3167
 msgid "Updating volume usage cache with totals"
 msgstr ""
 
-#: nova/compute/manager.py:3190
+#: nova/compute/manager.py:3203
 #, python-format
 msgid "allocate_port_for_instance returned %(ports)s ports"
 msgstr ""
 
-#: nova/compute/manager.py:3210
+#: nova/compute/manager.py:3223
 #, python-format
 msgid "Port %s is not attached"
 msgstr ""
 
-#: nova/compute/manager.py:3224
+#: nova/compute/manager.py:3237
 #, python-format
 msgid "Host %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3377
+#: nova/compute/manager.py:3390
 #, python-format
 msgid "Pre live migration failed at %s"
 msgstr ""
 
-#: nova/compute/manager.py:3405
+#: nova/compute/manager.py:3418
 msgid "_post_live_migration() is started.."
 msgstr ""
 
-#: nova/compute/manager.py:3460
+#: nova/compute/manager.py:3473
 #, python-format
 msgid "Migrating instance to %s finished successfully."
 msgstr ""
 
-#: nova/compute/manager.py:3462
+#: nova/compute/manager.py:3475
 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:3477
+#: nova/compute/manager.py:3490
 msgid "Post operation of migration started"
 msgstr ""
 
-#: nova/compute/manager.py:3509
+#: nova/compute/manager.py:3522
 #, python-format
 msgid "Failed to get compute_info for %s"
 msgstr ""
 
-#: nova/compute/manager.py:3638
+#: nova/compute/manager.py:3651
 msgid "Updated the info_cache for instance"
 msgstr ""
 
-#: nova/compute/manager.py:3688
+#: nova/compute/manager.py:3703
 #, python-format
 msgid ""
 "Found %(migration_count)d unconfirmed migrations older than "
 "%(confirm_window)d seconds"
 msgstr ""
 
-#: nova/compute/manager.py:3693
+#: nova/compute/manager.py:3708
 #, python-format
 msgid "Setting migration %(migration_id)s to error: %(reason)s"
 msgstr ""
 
-#: nova/compute/manager.py:3702
+#: nova/compute/manager.py:3717
 #, python-format
 msgid ""
 "Automatically confirming migration %(migration_id)s for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/compute/manager.py:3710
+#: nova/compute/manager.py:3725
 #, python-format
 msgid "Instance %s not found"
 msgstr ""
 
-#: nova/compute/manager.py:3715
+#: nova/compute/manager.py:3730
 msgid "In ERROR state"
 msgstr ""
 
-#: nova/compute/manager.py:3722
+#: nova/compute/manager.py:3737
 #, python-format
 msgid "In states %(vm_state)s/%(task_state)s, not RESIZED/None"
 msgstr ""
 
-#: nova/compute/manager.py:3733
+#: nova/compute/manager.py:3748
 #, python-format
 msgid "Error auto-confirming resize: %s. Will retry later."
 msgstr ""
 
-#: nova/compute/manager.py:3749
+#: nova/compute/manager.py:3764
 #, 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:3769
+#: nova/compute/manager.py:3784
 #, python-format
 msgid "Failed to generate usage audit for instance on host %s"
 msgstr ""
 
-#: nova/compute/manager.py:3793
+#: nova/compute/manager.py:3808
 msgid "Updating bandwidth usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3896
+#: nova/compute/manager.py:3911
 msgid "Updating volume usage cache"
 msgstr ""
 
-#: nova/compute/manager.py:3910
+#: nova/compute/manager.py:3925
 msgid "Updating host status"
 msgstr ""
 
-#: nova/compute/manager.py:3937
+#: nova/compute/manager.py:3952
 #, python-format
 msgid ""
 "Found %(num_db_instances)s in the database and %(num_vm_instances)s on "
 "the hypervisor."
 msgstr ""
 
-#: nova/compute/manager.py:3944 nova/compute/manager.py:3993
+#: nova/compute/manager.py:3959 nova/compute/manager.py:4008
 msgid "During sync_power_state the instance has a pending task. Skip."
 msgstr ""
 
-#: nova/compute/manager.py:3980
+#: nova/compute/manager.py:3995
 #, 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:4017
+#: nova/compute/manager.py:4032
 msgid "Instance shutdown by itself. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4029 nova/compute/manager.py:4038
-#: nova/compute/manager.py:4068
+#: nova/compute/manager.py:4044 nova/compute/manager.py:4053
+#: nova/compute/manager.py:4083
 msgid "error during stop() in sync_power_state."
 msgstr ""
 
-#: nova/compute/manager.py:4033
+#: nova/compute/manager.py:4048
 msgid "Instance is suspended unexpectedly. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4049
+#: nova/compute/manager.py:4064
 msgid "Instance is paused unexpectedly. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4055
+#: nova/compute/manager.py:4070
 msgid "Instance is unexpectedly not found. Ignore."
 msgstr ""
 
-#: nova/compute/manager.py:4061
+#: nova/compute/manager.py:4076
 msgid "Instance is not stopped. Calling the stop API."
 msgstr ""
 
-#: nova/compute/manager.py:4077
+#: nova/compute/manager.py:4092
 msgid "Instance is not (soft-)deleted."
 msgstr ""
 
-#: nova/compute/manager.py:4085
+#: nova/compute/manager.py:4100
 msgid "CONF.reclaim_instance_interval <= 0, skipping..."
 msgstr ""
 
-#: nova/compute/manager.py:4098
+#: nova/compute/manager.py:4113
 msgid "Reclaiming deleted instance"
 msgstr ""
 
-#: nova/compute/manager.py:4125
+#: nova/compute/manager.py:4140
 #, python-format
 msgid "Deleting orphan compute node %s"
 msgstr ""
 
-#: nova/compute/manager.py:4135 nova/compute/resource_tracker.py:321
+#: nova/compute/manager.py:4150 nova/compute/resource_tracker.py:321
 #, python-format
 msgid "No service record for host %s"
 msgstr ""
 
-#: nova/compute/manager.py:4175
+#: nova/compute/manager.py:4190
 #, python-format
 msgid ""
 "Detected instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4181
+#: nova/compute/manager.py:4196
 #, python-format
 msgid ""
 "Destroying instance with name label '%s' which is marked as DELETED but "
 "still present on host."
 msgstr ""
 
-#: nova/compute/manager.py:4188
+#: nova/compute/manager.py:4203
 #, python-format
 msgid "Unrecognized value '%s' for CONF.running_deleted_instance_action"
 msgstr ""
 
-#: nova/compute/manager.py:4215
+#: nova/compute/manager.py:4230
 #, python-format
 msgid "Setting instance back to ACTIVE after: %s"
 msgstr ""
@@ -5092,15 +5142,34 @@ msgid ""
 "start before nova-conductor?"
 msgstr ""
 
-#: nova/conductor/manager.py:115
+#: nova/conductor/manager.py:114
 #, python-format
 msgid "Instance update attempted for '%(key)s' on %(instance_uuid)s"
 msgstr ""
 
-#: nova/conductor/manager.py:290
+#: nova/conductor/manager.py:289
 msgid "Invalid block_device_mapping_destroy invocation"
 msgstr ""
 
+#: nova/conductor/tasks/live_migrate.py:103
+#, python-format
+msgid ""
+"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
+"memory(host:%(avail)s <= instance:%(mem_inst)s)"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:150
+#, python-format
+msgid "Skipping host: %(host)s because: %(e)s"
+msgstr ""
+
+#: nova/conductor/tasks/live_migrate.py:169
+#, python-format
+msgid ""
+"Exceeded max scheduling attempts %(max_attempts)d for instance "
+"%(instance_uuid)s during live migration"
+msgstr ""
+
 #: nova/console/manager.py:81 nova/console/vmrc_manager.py:63
 msgid "Adding console"
 msgstr ""
@@ -5179,7 +5248,7 @@ msgstr ""
 msgid "Failed to notify cells of instance update"
 msgstr ""
 
-#: nova/db/api.py:1550
+#: nova/db/api.py:1551
 msgid "Failed to notify cells of bw_usage update"
 msgstr ""
 
@@ -5238,7 +5307,7 @@ msgstr ""
 msgid "Change will make usage less than 0 for the following resources: %(unders)s"
 msgstr ""
 
-#: nova/db/sqlalchemy/api.py:4445
+#: nova/db/sqlalchemy/api.py:4448
 #, python-format
 msgid ""
 "Volume(%s) has lower stats then what is in the database. Instance must "
@@ -5854,75 +5923,75 @@ msgstr ""
 msgid "Multiple floating IP pools matches found for name '%s'"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:53
+#: nova/network/security_group/quantum_driver.py:56
 #, python-format
 msgid "Quantum Error creating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:71
+#: nova/network/security_group/quantum_driver.py:75
 #, python-format
 msgid "Quantum Error updating security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:124
+#: nova/network/security_group/quantum_driver.py:129
 #, python-format
 msgid "Quantum security group %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:127
-#: nova/network/security_group/quantum_driver.py:173
-#: nova/network/security_group/quantum_driver.py:263
+#: nova/network/security_group/quantum_driver.py:132
+#: nova/network/security_group/quantum_driver.py:179
+#: nova/network/security_group/quantum_driver.py:270
 #, python-format
 msgid "Quantum Error: %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:147
+#: nova/network/security_group/quantum_driver.py:153
 msgid "Quantum Error getting security groups"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:157
+#: nova/network/security_group/quantum_driver.py:162
 msgid "Security group id should be uuid"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:192
+#: nova/network/security_group/quantum_driver.py:199
 #, python-format
 msgid "Quantum Error getting security group %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:196
-#: nova/network/security_group/quantum_driver.py:358
-#: nova/network/security_group/quantum_driver.py:364
-#: nova/network/security_group/quantum_driver.py:391
-#: nova/network/security_group/quantum_driver.py:406
-#: nova/network/security_group/quantum_driver.py:412
-#: nova/network/security_group/quantum_driver.py:441
+#: nova/network/security_group/quantum_driver.py:203
+#: nova/network/security_group/quantum_driver.py:366
+#: nova/network/security_group/quantum_driver.py:373
+#: nova/network/security_group/quantum_driver.py:399
+#: nova/network/security_group/quantum_driver.py:415
+#: nova/network/security_group/quantum_driver.py:422
+#: nova/network/security_group/quantum_driver.py:451
 msgid "Quantum Error:"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:249
+#: nova/network/security_group/quantum_driver.py:257
 #, python-format
 msgid "Quantum Error unable to delete %s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:260
+#: nova/network/security_group/quantum_driver.py:267
 #, python-format
 msgid "Quantum security group rule %s not found"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:374
+#: nova/network/security_group/quantum_driver.py:382
 #, python-format
 msgid ""
 "Cannot add security group %(name)s to %(instance)s since the port "
 "%(port_id)s does not meet security requirements"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:384
-#: nova/network/security_group/quantum_driver.py:434
+#: nova/network/security_group/quantum_driver.py:392
+#: nova/network/security_group/quantum_driver.py:443
 #, python-format
 msgid "Adding security group %(security_group_id)s to port %(port_id)s"
 msgstr ""
 
-#: nova/network/security_group/quantum_driver.py:444
+#: nova/network/security_group/quantum_driver.py:453
 #, python-format
 msgid ""
 "Security group %(security_group_name)s not assocaited with the instance "
@@ -5948,7 +6017,7 @@ msgstr ""
 msgid "Unable to instantiate unregistered object type %(objtype)s"
 msgstr ""
 
-#: nova/objects/base.py:304
+#: nova/objects/base.py:305
 #, python-format
 msgid "Cannot load '%(attrname)s' in the base class"
 msgstr ""
@@ -6215,11 +6284,6 @@ msgstr ""
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: nova/openstack/common/plugin/pluginmanager.py:66
-#, python-format
-msgid "Failed to load plugin %(plug)s: %(exc)s"
-msgstr ""
-
 #: nova/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
@@ -6646,86 +6710,79 @@ msgstr ""
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: nova/scheduler/chance.py:51
+#: nova/scheduler/chance.py:56
 msgid "Is the appropriate service running?"
 msgstr ""
 
-#: nova/scheduler/chance.py:56
+#: nova/scheduler/chance.py:61
 msgid "Could not find another compute"
 msgstr ""
 
-#: nova/scheduler/driver.py:61
+#: nova/scheduler/driver.py:57
 msgid "Exception during scheduler.run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:63 nova/scheduler/manager.py:225
+#: nova/scheduler/driver.py:59 nova/scheduler/manager.py:233
 #, python-format
-msgid "Setting instance to %(state)s state."
+msgid "Setting instance to %s state."
 msgstr ""
 
-#: nova/scheduler/driver.py:156
+#: nova/scheduler/driver.py:150
 msgid "Driver must implement schedule_prep_resize"
 msgstr ""
 
-#: nova/scheduler/driver.py:164
+#: nova/scheduler/driver.py:158
 msgid "Driver must implement schedule_run_instance"
 msgstr ""
 
-#: nova/scheduler/driver.py:169
+#: nova/scheduler/driver.py:163
 msgid "Driver must implement select_hosts"
 msgstr ""
 
-#: nova/scheduler/driver.py:339
-#, python-format
-msgid ""
-"Unable to migrate %(instance_uuid)s to %(dest)s: Lack of "
-"memory(host:%(avail)s <= instance:%(mem_inst)s)"
-msgstr ""
-
-#: nova/scheduler/filter_scheduler.py:73
+#: nova/scheduler/filter_scheduler.py:76
 #, python-format
 msgid ""
 "Attempting to build %(num_instances)d instance(s) uuids: "
 "%(instance_uuids)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:77
+#: nova/scheduler/filter_scheduler.py:80
 #, python-format
 msgid "Request Spec: %s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:97
+#: nova/scheduler/filter_scheduler.py:100
 #, fuzzy, python-format
 msgid "Choosing host %(weighed_host)s for instance %(instance_uuid)s"
 msgstr "掛載點 %(mountpoint)s 掛載到虛擬機器 %(instance_name)s"
 
-#: nova/scheduler/filter_scheduler.py:239
+#: nova/scheduler/filter_scheduler.py:242
 msgid "Invalid value for 'scheduler_max_attempts', must be >= 1"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:256
+#: nova/scheduler/filter_scheduler.py:259
 #, python-format
 msgid "Error from last host: %(last_host)s (node %(last_node)s): %(exc)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:288
+#: nova/scheduler/filter_scheduler.py:291
 #, python-format
 msgid ""
 "Exceeded max scheduling attempts %(max_attempts)d for instance "
 "%(instance_uuid)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:356
+#: nova/scheduler/filter_scheduler.py:359
 #, python-format
 msgid "Filtered %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:361
+#: nova/scheduler/filter_scheduler.py:364
 #, python-format
 msgid "Weighed %(hosts)s"
 msgstr ""
 
-#: nova/scheduler/filter_scheduler.py:403
+#: nova/scheduler/filter_scheduler.py:417
 #, python-format
 msgid "Unable to migrate %(instance_uuid)s to %(dest)s: Lack of memory"
 msgstr ""
@@ -6760,23 +6817,23 @@ msgstr ""
 msgid "Ignoring %(service_name)s service update from %(host)s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:384
+#: nova/scheduler/host_manager.py:385
 #, python-format
 msgid "Received %(service_name)s service update from %(state_key)s."
 msgstr ""
 
-#: nova/scheduler/host_manager.py:403
+#: nova/scheduler/host_manager.py:405
 #: nova/scheduler/filters/trusted_filter.py:214
 #, python-format
 msgid "No service for compute ID %s"
 msgstr ""
 
-#: nova/scheduler/host_manager.py:425
+#: nova/scheduler/host_manager.py:427
 #, python-format
 msgid "Removing dead compute node %(host)s:%(node)s from scheduler"
 msgstr ""
 
-#: nova/scheduler/manager.py:211
+#: nova/scheduler/manager.py:218
 #, python-format
 msgid "Failed to schedule_%(method)s: %(ex)s"
 msgstr ""
@@ -6786,9 +6843,9 @@ msgstr ""
 msgid "Could not stat scheduler options file %(filename)s: '%(e)s'"
 msgstr ""
 
-#: nova/scheduler/scheduler_options.py:79
+#: nova/scheduler/scheduler_options.py:80
 #, python-format
-msgid "Could not decode scheduler options: '%(e)s'"
+msgid "Could not decode scheduler options: '%s'"
 msgstr ""
 
 #: nova/scheduler/filters/affinity_filter.py:95
@@ -6812,7 +6869,7 @@ msgstr ""
 
 #: nova/scheduler/filters/aggregate_multitenancy_isolation.py:44
 #, python-format
-msgid "%(host_state)s fails tenant id on aggregate"
+msgid "%s fails tenant id on aggregate"
 msgstr ""
 
 #: nova/scheduler/filters/compute_capabilities_filter.py:58
@@ -7089,42 +7146,44 @@ msgstr ""
 msgid "Quota exceeded for cores: Requested 2, but already used 9 of 10 cores"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1130
-#: nova/tests/compute/test_compute.py:1148
-#: nova/tests/compute/test_compute.py:1199
-#: nova/tests/compute/test_compute.py:1226
-#: nova/tests/compute/test_compute.py:1272
-#: nova/tests/compute/test_compute.py:4124
+#: nova/tests/compute/test_compute.py:1137
+#: nova/tests/compute/test_compute.py:1155
+#: nova/tests/compute/test_compute.py:1206
+#: nova/tests/compute/test_compute.py:1231
+#: nova/tests/compute/test_compute.py:1257
+#: nova/tests/compute/test_compute.py:1304
+#: nova/tests/compute/test_compute.py:4158
 #, python-format
 msgid "Running instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1136
-#: nova/tests/compute/test_compute.py:1171
-#: nova/tests/compute/test_compute.py:1214
-#: nova/tests/compute/test_compute.py:1244
+#: nova/tests/compute/test_compute.py:1143
+#: nova/tests/compute/test_compute.py:1178
+#: nova/tests/compute/test_compute.py:1221
+#: nova/tests/compute/test_compute.py:1245
+#: nova/tests/compute/test_compute.py:1275
 #, python-format
 msgid "After terminating instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:1814
+#: nova/tests/compute/test_compute.py:1847
 msgid "Internal error"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4135
+#: nova/tests/compute/test_compute.py:4169
 #, python-format
 msgid "After force-killing instances: %s"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:4635
+#: nova/tests/compute/test_compute.py:4680
 msgid "wrong host/node"
 msgstr ""
 
-#: nova/tests/compute/test_compute.py:9437
+#: nova/tests/compute/test_compute.py:9579
 msgid "spawn error"
 msgstr ""
 
-#: nova/tests/db/test_migrations.py:1801
+#: nova/tests/db/test_migrations.py:1808
 #, python-format
 msgid ""
 "The following migrations are missing a downgrade:\n"
@@ -7251,12 +7310,12 @@ msgid ""
 "left to copy"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:899
+#: nova/tests/virt/xenapi/test_xenapi.py:900
 #, python-format
 msgid "Creating files in %s to simulate guest agent"
 msgstr ""
 
-#: nova/tests/virt/xenapi/test_xenapi.py:910
+#: nova/tests/virt/xenapi/test_xenapi.py:911
 #, python-format
 msgid "Removing simulated guest agent files in %s"
 msgstr ""
@@ -7266,25 +7325,25 @@ msgstr ""
 msgid "Added %(filepath)s to config drive"
 msgstr ""
 
-#: nova/virt/driver.py:948
+#: nova/virt/driver.py:949
 msgid "Event must be an instance of nova.virt.event.Event"
 msgstr ""
 
-#: nova/virt/driver.py:954
+#: nova/virt/driver.py:955
 #, python-format
 msgid "Exception dispatching event %(event)s: %(ex)s"
 msgstr ""
 
-#: nova/virt/driver.py:976
+#: nova/virt/driver.py:977
 msgid "Compute driver option required, but not specified"
 msgstr ""
 
-#: nova/virt/driver.py:979
+#: nova/virt/driver.py:980
 #, python-format
 msgid "Loading compute driver '%s'"
 msgstr ""
 
-#: nova/virt/driver.py:986
+#: nova/virt/driver.py:987
 msgid "Unable to load the virtualization driver"
 msgstr ""
 
@@ -7293,7 +7352,7 @@ msgstr ""
 msgid "Key '%(key)s' not in instances '%(inst)s'"
 msgstr ""
 
-#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:306
+#: nova/virt/firewall.py:189 nova/virt/libvirt/firewall.py:307
 msgid "Attempted to unfilter instance which is not filtered"
 msgstr ""
 
@@ -7347,37 +7406,37 @@ msgstr ""
 msgid "Baremetal node id not supplied to driver for %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:257
+#: nova/virt/baremetal/driver.py:259
 #, python-format
 msgid "Error deploying instance %(instance)s on baremetal node %(node)s."
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:284
+#: nova/virt/baremetal/driver.py:286
 #, python-format
 msgid "Baremetal power manager failed to restart node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:295
+#: nova/virt/baremetal/driver.py:297
 #, python-format
 msgid "Destroy called on non-existing instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:313
+#: nova/virt/baremetal/driver.py:315
 #, python-format
 msgid "Error from baremetal driver during destroy: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:318
+#: nova/virt/baremetal/driver.py:320
 #, python-format
 msgid "Error while recording destroy failure in baremetal database: %s"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:328
+#: nova/virt/baremetal/driver.py:330
 #, python-format
 msgid "Baremetal power manager failed to stop node for instance %r"
 msgstr ""
 
-#: nova/virt/baremetal/driver.py:340
+#: nova/virt/baremetal/driver.py:343
 #, python-format
 msgid "Baremetal power manager failed to start node for instance %r"
 msgstr ""
@@ -7430,85 +7489,85 @@ msgstr ""
 msgid "Activate node called, but node %s is already active"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:92
+#: nova/virt/baremetal/pxe.py:109
 #, python-format
 msgid "Building PXE config for deployment %s."
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:231
+#: nova/virt/baremetal/pxe.py:228
 #, python-format
 msgid ""
 "Can not activate PXE bootloader. The following boot parameters were not "
 "passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:255 nova/virt/baremetal/tilera.py:170
+#: nova/virt/baremetal/pxe.py:252 nova/virt/baremetal/tilera.py:146
 #, fuzzy, python-format
 msgid "Fetching kernel and ramdisk for instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/pxe.py:287 nova/virt/baremetal/tilera.py:201
+#: nova/virt/baremetal/pxe.py:284 nova/virt/baremetal/tilera.py:177
 #, python-format
 msgid "Fetching image %(ami)s for instance %(name)s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:327 nova/virt/baremetal/tilera.py:237
+#: nova/virt/baremetal/pxe.py:324 nova/virt/baremetal/tilera.py:213
 #, fuzzy, python-format
 msgid "Injecting files into image for instance %(name)s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/pxe.py:459 nova/virt/baremetal/tilera.py:356
+#: nova/virt/baremetal/pxe.py:457 nova/virt/baremetal/tilera.py:332
 #, python-format
 msgid "Node associated with another instance while waiting for deploy of %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:466
+#: nova/virt/baremetal/pxe.py:464
 #, fuzzy, python-format
 msgid "PXE deploy started for instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/pxe.py:471
+#: nova/virt/baremetal/pxe.py:469
 #, python-format
 msgid "PXE deploy completed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:475
+#: nova/virt/baremetal/pxe.py:473
 #, python-format
 msgid "PXE deploy failed for instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:477 nova/virt/baremetal/tilera.py:381
+#: nova/virt/baremetal/pxe.py:475 nova/virt/baremetal/tilera.py:357
 #, python-format
 msgid "Baremetal node deleted while waiting for deployment of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/pxe.py:482
+#: nova/virt/baremetal/pxe.py:480
 #, python-format
 msgid "Timeout reached while waiting for PXE deploy of instance %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:145
+#: nova/virt/baremetal/tilera.py:121
 #, python-format
 msgid ""
 "Can not activate Tilera bootloader. The following boot parameters were "
 "not passed to baremetal driver: %s"
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:362
+#: nova/virt/baremetal/tilera.py:338
 #, fuzzy, python-format
 msgid "Tilera deploy started for instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/tilera.py:368
+#: nova/virt/baremetal/tilera.py:344
 #, fuzzy, python-format
 msgid "Tilera deploy completed for instance %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/baremetal/tilera.py:376
+#: nova/virt/baremetal/tilera.py:352
 msgid "Node is unknown error state."
 msgstr ""
 
-#: nova/virt/baremetal/tilera.py:379
+#: nova/virt/baremetal/tilera.py:355
 #, python-format
 msgid "Tilera deploy failed for instance %s"
 msgstr ""
@@ -7605,12 +7664,12 @@ msgstr ""
 msgid "virtual_power_host_pass/key not set. Can not Start"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:122
+#: nova/virt/baremetal/volume_driver.py:123
 #, python-format
 msgid "baremetal driver was unable to delete tid %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:186
+#: nova/virt/baremetal/volume_driver.py:187
 #, python-format
 msgid "Could not determine iscsi initiator name for instance %s"
 msgstr ""
@@ -7620,7 +7679,7 @@ msgstr ""
 msgid "No fixed PXE IP is associated to %s"
 msgstr ""
 
-#: nova/virt/baremetal/volume_driver.py:259
+#: nova/virt/baremetal/volume_driver.py:260
 #, python-format
 msgid "detach volume could not find tid for %s"
 msgstr ""
@@ -7634,22 +7693,18 @@ msgstr ""
 msgid "Failed to associate instance %(i_uuid)s to baremetal node %(n_uuid)s."
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:329
-msgid "No more PXE IPs available"
-msgstr ""
-
-#: nova/virt/baremetal/db/sqlalchemy/api.py:351
-#: nova/virt/baremetal/db/sqlalchemy/api.py:393
+#: nova/virt/baremetal/db/sqlalchemy/api.py:246
+#: nova/virt/baremetal/db/sqlalchemy/api.py:288
 #, python-format
 msgid "Baremetal interface %s not found"
 msgstr ""
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:403
+#: nova/virt/baremetal/db/sqlalchemy/api.py:298
 #, fuzzy, python-format
 msgid "Baremetal interface %s already in use"
 msgstr "建立虛擬介�失敗"
 
-#: nova/virt/baremetal/db/sqlalchemy/api.py:417
+#: nova/virt/baremetal/db/sqlalchemy/api.py:311
 #, python-format
 msgid "Baremetal virtual interface %s not found"
 msgstr ""
@@ -7762,12 +7817,12 @@ msgid ""
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:45 nova/virt/disk/mount/api.py:61
-#: nova/virt/disk/vfs/localfs.py:67
+#: nova/virt/disk/vfs/localfs.py:68
 msgid "Using LoopMount"
 msgstr ""
 
 #: nova/virt/disk/mount/api.py:50 nova/virt/disk/mount/api.py:66
-#: nova/virt/disk/vfs/localfs.py:72
+#: nova/virt/disk/vfs/localfs.py:73
 msgid "Using NbdMount"
 msgstr ""
 
@@ -8020,12 +8075,12 @@ msgstr ""
 msgid "chown uid=%(uid)d gid=%(gid)s"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:46
+#: nova/virt/disk/vfs/localfs.py:47
 #, python-format
 msgid "File path %s not valid"
 msgstr ""
 
-#: nova/virt/disk/vfs/localfs.py:80
+#: nova/virt/disk/vfs/localfs.py:82
 #, fuzzy, python-format
 msgid "Failed to mount image %(ex)s)"
 msgstr "找�到Volume %s"
@@ -8054,23 +8109,23 @@ msgstr ""
 msgid "The ISCSI initiator name can't be found. Choosing the default one"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:150
+#: nova/virt/hyperv/driver.py:151
 msgid "plug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:153
+#: nova/virt/hyperv/driver.py:154
 msgid "unplug_vifs called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:156
+#: nova/virt/hyperv/driver.py:157
 msgid "ensure_filtering_rules_for_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:160
+#: nova/virt/hyperv/driver.py:161
 msgid "unfilter_instance called"
 msgstr ""
 
-#: nova/virt/hyperv/driver.py:191
+#: nova/virt/hyperv/driver.py:192
 msgid "get_console_output called"
 msgstr ""
 
@@ -8083,7 +8138,7 @@ msgstr ""
 msgid "get_available_resource called"
 msgstr ""
 
-#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3943
+#: nova/virt/hyperv/hostops.py:135 nova/virt/libvirt/driver.py:3968
 #: nova/virt/xenapi/host.py:148
 msgid "Updating host stats"
 msgstr ""
@@ -8435,12 +8490,12 @@ msgstr ""
 msgid "Using config drive for instance: %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1924
+#: nova/virt/hyperv/vmops.py:227 nova/virt/libvirt/driver.py:1933
 #, python-format
 msgid "Creating config drive at %(path)s"
 msgstr ""
 
-#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1931
+#: nova/virt/hyperv/vmops.py:235 nova/virt/libvirt/driver.py:1940
 #, python-format
 msgid "Creating config drive failed with error: %s"
 msgstr ""
@@ -8599,7 +8654,7 @@ msgstr "�載_Volume: %(instance_name)s, %(mountpoint)s"
 msgid "Detaching physical disk from instance: %s"
 msgstr "無法掛載Volume 到虛擬機器 %s"
 
-#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:956
+#: nova/virt/hyperv/volumeops.py:186 nova/virt/libvirt/driver.py:959
 msgid "Could not determine iscsi initiator name"
 msgstr ""
 
@@ -8638,237 +8693,237 @@ msgstr ""
 msgid "Invalid cachemode %(cache_mode)s specified for disk type %(disk_type)s."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:564
+#: nova/virt/libvirt/driver.py:565
 #, python-format
 msgid "Nova requires libvirt version %(major)i.%(minor)i.%(micro)i or greater."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:578
+#: nova/virt/libvirt/driver.py:579
 #, python-format
 msgid "Connecting to libvirt: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:596
+#: nova/virt/libvirt/driver.py:597
 #, python-format
 msgid "URI %s does not support events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:606
+#: nova/virt/libvirt/driver.py:607
 #, python-format
 msgid "URI %s does not support connection events"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:616
+#: nova/virt/libvirt/driver.py:617
 #, python-format
 msgid "Connection to libvirt lost: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:629
+#: nova/virt/libvirt/driver.py:630
 msgid "Connection to libvirt broke"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:651 nova/virt/libvirt/driver.py:654
+#: nova/virt/libvirt/driver.py:652 nova/virt/libvirt/driver.py:655
 #, python-format
 msgid "Can not handle authentication request for %d credentials"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:672
+#: nova/virt/libvirt/driver.py:673
 #, fuzzy, python-format
 msgid "Connection to libvirt failed: %s"
 msgstr "連接到glance失敗"
 
-#: nova/virt/libvirt/driver.py:781
+#: nova/virt/libvirt/driver.py:782
 #, python-format
 msgid "Error from libvirt during destroy. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:796
+#: nova/virt/libvirt/driver.py:798
 msgid "During wait destroy, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:801
+#: nova/virt/libvirt/driver.py:803
 msgid "Instance destroyed successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:811
+#: nova/virt/libvirt/driver.py:813
 msgid "Instance may be started again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:821
+#: nova/virt/libvirt/driver.py:823
 msgid "Going to destroy instance again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:840
+#: nova/virt/libvirt/driver.py:842
 msgid "Error from libvirt during undefineFlags. Retrying with undefine"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:856
+#: nova/virt/libvirt/driver.py:858
 #, python-format
 msgid "Error from libvirt during undefine. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:876
+#: nova/virt/libvirt/driver.py:878
 msgid "Instance may be still running, destroy it again."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:882
+#: nova/virt/libvirt/driver.py:884
 #, python-format
 msgid "Error from libvirt during unfilter. Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:910
+#: nova/virt/libvirt/driver.py:913
 #, python-format
-msgid "Deleting instance files %(target)s"
+msgid "Deleting instance files %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:919
+#: nova/virt/libvirt/driver.py:922
 #, python-format
 msgid "Failed to cleanup directory %(target)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:962
+#: nova/virt/libvirt/driver.py:965
 msgid "Could not determine fibre channel world wide node names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:969
+#: nova/virt/libvirt/driver.py:972
 msgid "Could not determine fibre channel world wide port names"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1093
+#: nova/virt/libvirt/driver.py:1096
 msgid "During detach_volume, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1117
+#: nova/virt/libvirt/driver.py:1120
 msgid "attaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1137
+#: nova/virt/libvirt/driver.py:1140
 msgid "During detach_interface, instance disappeared."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1141
+#: nova/virt/libvirt/driver.py:1144
 msgid "detaching network adapter failed."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1227
+#: nova/virt/libvirt/driver.py:1242
 msgid "Beginning live snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1230
+#: nova/virt/libvirt/driver.py:1245
 msgid "Beginning cold snapshot process"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1259
+#: nova/virt/libvirt/driver.py:1274
 msgid "Snapshot extracted, beginning image upload"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1271
+#: nova/virt/libvirt/driver.py:1286
 msgid "Snapshot image upload complete"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1344
+#: nova/virt/libvirt/driver.py:1352
 msgid "Instance soft rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1348
+#: nova/virt/libvirt/driver.py:1356
 msgid "Failed to soft reboot instance."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1383
+#: nova/virt/libvirt/driver.py:1391
 msgid "Instance shutdown successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1391
+#: nova/virt/libvirt/driver.py:1399
 msgid "Instance may have been rebooted during soft reboot, so return now."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1439
+#: nova/virt/libvirt/driver.py:1447
 msgid "Instance rebooted successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1585
+#: nova/virt/libvirt/driver.py:1593
 msgid "Instance is running"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1592 nova/virt/powervm/operator.py:220
+#: nova/virt/libvirt/driver.py:1600 nova/virt/powervm/operator.py:220
 msgid "Instance spawned successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1608
+#: nova/virt/libvirt/driver.py:1616
 #, python-format
 msgid "data: %(data)r, fpath: %(fpath)r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1645 nova/virt/libvirt/driver.py:1671
+#: nova/virt/libvirt/driver.py:1654 nova/virt/libvirt/driver.py:1680
 #, python-format
 msgid "Truncated console log returned, %d bytes ignored"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1660 nova/virt/xenapi/vmops.py:1442
+#: nova/virt/libvirt/driver.py:1669 nova/virt/xenapi/vmops.py:1442
 #, fuzzy
 msgid "Guest does not have a console available"
 msgstr "使用者並沒有管�者權力"
 
-#: nova/virt/libvirt/driver.py:1729
+#: nova/virt/libvirt/driver.py:1738
 #, python-format
 msgid "Path '%(path)s' supports direct I/O"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1733
+#: nova/virt/libvirt/driver.py:1742
 #, python-format
 msgid "Path '%(path)s' does not support direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1738 nova/virt/libvirt/driver.py:1743
+#: nova/virt/libvirt/driver.py:1747 nova/virt/libvirt/driver.py:1752
 #, python-format
 msgid "Error on '%(path)s' while checking direct I/O: '%(ex)s'"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1814
+#: nova/virt/libvirt/driver.py:1823
 msgid "Creating image"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1915
+#: nova/virt/libvirt/driver.py:1924
 msgid "Using config drive"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1964
+#: nova/virt/libvirt/driver.py:1977
 #, python-format
 msgid "Injecting %(inj)s into image %(img_id)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:1974
+#: nova/virt/libvirt/driver.py:1989
 #, python-format
 msgid "Error injecting data into image %(img_id)s (%(e)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2033
+#: nova/virt/libvirt/driver.py:2049
 #, python-format
 msgid ""
 "Config requested an explicit CPU model, but the current libvirt "
 "hypervisor '%s' does not support selecting CPU models"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2039
+#: nova/virt/libvirt/driver.py:2055
 msgid "Config requested a custom CPU model, but no model name was provided"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2043
+#: nova/virt/libvirt/driver.py:2059
 msgid "A CPU model name should not be set when a host CPU model is requested"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2047
+#: nova/virt/libvirt/driver.py:2063
 #, python-format
 msgid "CPU mode '%(mode)s' model '%(model)s' was chosen"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2063
+#: nova/virt/libvirt/driver.py:2079
 msgid ""
 "Passthrough of the host CPU was requested but this libvirt version does "
 "not support this feature"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2387
+#: nova/virt/libvirt/driver.py:2403
 #, python-format
 msgid ""
 "Start to_xml instance=%(instance)s network_info=%(network_info)s "
@@ -8876,76 +8931,76 @@ msgid ""
 "rescue=%(rescue)sblock_device_info=%(block_device_info)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2402
+#: nova/virt/libvirt/driver.py:2420
 #, python-format
 msgid "End to_xml instance=%(instance)s xml=%(xml)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2419
+#: nova/virt/libvirt/driver.py:2438
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_id)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2440
+#: nova/virt/libvirt/driver.py:2459
 #, python-format
 msgid ""
 "Error from libvirt while looking up %(instance_name)s: [Error Code "
 "%(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2540 nova/virt/libvirt/driver.py:2731
-#: nova/virt/libvirt/driver.py:2757
+#: nova/virt/libvirt/driver.py:2562 nova/virt/libvirt/driver.py:2753
+#: nova/virt/libvirt/driver.py:2779
 #, python-format
 msgid "libvirt can't find a domain with id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2622 nova/virt/libvirt/driver.py:2626
+#: nova/virt/libvirt/driver.py:2644 nova/virt/libvirt/driver.py:2648
 #, python-format
 msgid "Invalid range expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2635
+#: nova/virt/libvirt/driver.py:2657
 #, python-format
 msgid "Invalid exclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2642
+#: nova/virt/libvirt/driver.py:2664
 #, python-format
 msgid "Invalid inclusion expression %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2647
+#: nova/virt/libvirt/driver.py:2669
 #, python-format
 msgid "No CPUs available after parsing %r"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2664
+#: nova/virt/libvirt/driver.py:2686
 msgid ""
 "Cannot get the number of cpu, because this function is not implemented "
 "for this platform. "
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2674
+#: nova/virt/libvirt/driver.py:2696
 msgid "Invalid vcpu_pin_set config, out of hypervisor cpu range."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2726
+#: nova/virt/libvirt/driver.py:2748
 #, python-format
 msgid "couldn't obtain the vpu count from domain id: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2798
+#: nova/virt/libvirt/driver.py:2820
 msgid "libvirt version is too old (does not support getVersion)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2883
+#: nova/virt/libvirt/driver.py:2905
 #, fuzzy, python-format
 msgid "Trying to get stats for the volume %s"
 msgstr "無法�載 Volume %s"
 
-#: nova/virt/libvirt/driver.py:2896
+#: nova/virt/libvirt/driver.py:2918
 #, python-format
 msgid ""
 "Got volume usage stats for the volume=%(volume)s, instance=%(instance)s, "
@@ -8953,50 +9008,50 @@ msgid ""
 "wr_bytes=%(wr_bytes)d"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2914
+#: nova/virt/libvirt/driver.py:2936
 #, python-format
 msgid ""
 "Getting block stats failed, device might have been detached. "
 "Instance=%(instance_name)s Disk=%(disk)s Code=%(errcode)s Error=%(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2919
+#: nova/virt/libvirt/driver.py:2942
 #, python-format
 msgid ""
 "Could not find domain in libvirt for instance %s. Cannot get block stats "
 "for device"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:2996
+#: nova/virt/libvirt/driver.py:3019
 #, python-format
 msgid ""
 "Creating tmpfile %s to verify with other compute node that the instance "
 "is on the same shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3077
+#: nova/virt/libvirt/driver.py:3101
 msgid "Block migration can not be used with shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3085
+#: nova/virt/libvirt/driver.py:3109
 msgid "Live migration can not be used without shared storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3130
+#: nova/virt/libvirt/driver.py:3153
 #, python-format
 msgid ""
 "Unable to migrate %(instance_uuid)s: Disk of instance is too "
 "large(available on destination host:%(available)s < need:%(necessary)s)"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3155
+#: nova/virt/libvirt/driver.py:3181
 #, python-format
 msgid ""
 "Instance launched has CPU info:\n"
 "%s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3167
+#: nova/virt/libvirt/driver.py:3193
 #, python-format
 msgid ""
 "CPU doesn't have compatibility.\n"
@@ -9006,69 +9061,69 @@ msgid ""
 "Refer to %(u)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3184
+#: nova/virt/libvirt/driver.py:3210
 #, python-format
 msgid ""
 "Creating tmpfile %s to notify to other compute nodes that they should "
 "mount the same storage."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3234
+#: nova/virt/libvirt/driver.py:3260
 #, python-format
 msgid "The firewall filter for %s does not exist"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3306
+#: nova/virt/libvirt/driver.py:3332
 #, python-format
-msgid "Live Migration failure: %(e)s"
+msgid "Live Migration failure: %s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3408
+#: nova/virt/libvirt/driver.py:3434
 #, python-format
 msgid "plug_vifs() failed %(cnt)d. Retry up to %(max_retry)d."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3520
+#: nova/virt/libvirt/driver.py:3546
 #, python-format
 msgid ""
 "Error from libvirt while getting description of %(instance_name)s: [Error"
 " Code %(error_code)s] %(ex)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3537
+#: nova/virt/libvirt/driver.py:3566
 #, python-format
-msgid "skipping %(path)s since it looks like volume"
+msgid "skipping %s since it looks like volume"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3542
+#: nova/virt/libvirt/driver.py:3570
 #, python-format
-msgid "skipping disk for %(instance_name)s as it does not have a path"
+msgid "skipping disk for %s as it does not have a path"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3583
+#: nova/virt/libvirt/driver.py:3610
 #, python-format
 msgid "Getting disk size of %(i_name)s: %(e)s"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3653
+#: nova/virt/libvirt/driver.py:3680
 msgid "Starting migrate_disk_and_power_off"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3721
+#: nova/virt/libvirt/driver.py:3748
 msgid "Instance running successfully."
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3727
+#: nova/virt/libvirt/driver.py:3754
 msgid "Starting finish_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3792
+#: nova/virt/libvirt/driver.py:3819
 msgid "Starting finish_revert_migration"
 msgstr ""
 
-#: nova/virt/libvirt/driver.py:3915
+#: nova/virt/libvirt/driver.py:3942
 #, python-format
-msgid "Checking instance files accessability%(instance_path)s"
+msgid "Checking instance files accessability %s"
 msgstr ""
 
 #: nova/virt/libvirt/firewall.py:51
@@ -9087,15 +9142,15 @@ msgstr ""
 
 #: nova/virt/libvirt/firewall.py:248
 #, python-format
-msgid "The nwfilter(%(instance_filter_name)s) is not found."
+msgid "The nwfilter(%s) is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:271
+#: nova/virt/libvirt/firewall.py:270
 #, python-format
 msgid "The nwfilter(%(instance_filter_name)s) for%(name)s is not found."
 msgstr ""
 
-#: nova/virt/libvirt/firewall.py:287
+#: nova/virt/libvirt/firewall.py:288
 msgid "iptables firewall: Setup Basic Filtering"
 msgstr ""
 
@@ -9286,47 +9341,47 @@ msgstr ""
 msgid "Can't retrieve root device path from instance libvirt configuration"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:386
-#: nova/virt/libvirt/vif.py:473
+#: nova/virt/libvirt/vif.py:265 nova/virt/libvirt/vif.py:387
+#: nova/virt/libvirt/vif.py:475
 #, python-format
 msgid ""
 "vif_type=%(vif_type)s instance=%(instance)s network=%(network)s "
 "mapping=%(mapping)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:271 nova/virt/libvirt/vif.py:392
-#: nova/virt/libvirt/vif.py:479
+#: nova/virt/libvirt/vif.py:272 nova/virt/libvirt/vif.py:394
+#: nova/virt/libvirt/vif.py:482
 msgid "vif_type parameter must be present for this vif_driver implementation"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:292 nova/virt/libvirt/vif.py:405
-#: nova/virt/libvirt/vif.py:492
+#: nova/virt/libvirt/vif.py:293 nova/virt/libvirt/vif.py:407
+#: nova/virt/libvirt/vif.py:495
 #, python-format
 msgid "Unexpected vif_type=%s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:304
+#: nova/virt/libvirt/vif.py:305
 #, python-format
 msgid "Ensuring vlan %(vlan)s and bridge %(bridge)s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:314
+#: nova/virt/libvirt/vif.py:315
 #, python-format
 msgid "Ensuring bridge %s"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:422 nova/virt/libvirt/vif.py:451
+#: nova/virt/libvirt/vif.py:424 nova/virt/libvirt/vif.py:453
 msgid "Failed while unplugging vif"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:502
+#: nova/virt/libvirt/vif.py:505
 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:529
+#: nova/virt/libvirt/vif.py:532
 msgid ""
 "The LibvirtOpenVswitchDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9334,7 +9389,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:558
+#: nova/virt/libvirt/vif.py:561
 msgid ""
 "The LibvirtHybridOVSBridgeDriver VIF driver is now deprecated and will be"
 " removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9342,7 +9397,7 @@ msgid ""
 "attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:587
+#: nova/virt/libvirt/vif.py:590
 msgid ""
 "The LibvirtOpenVswitchVirtualPortDriver VIF driver is now deprecated and "
 "will be removed in the next release. Please use the "
@@ -9350,7 +9405,7 @@ msgid ""
 "reports the 'vif_type' attribute"
 msgstr ""
 
-#: nova/virt/libvirt/vif.py:614
+#: nova/virt/libvirt/vif.py:617
 msgid ""
 "The QuantumLinuxBridgeVIFDriver VIF driver is now deprecated and will be "
 "removed in the next release. Please use the LibvirtGenericVIFDriver VIF "
@@ -9563,7 +9618,7 @@ msgstr ""
 msgid "%(inst_name)s captured in %(snapshot_time)s seconds"
 msgstr ""
 
-#: nova/virt/powervm/driver.py:303
+#: nova/virt/powervm/driver.py:304
 #, python-format
 msgid "Unrecognized root disk information: %s"
 msgstr ""
@@ -9710,32 +9765,32 @@ msgid ""
 " vmwareapi.VMwareVCDriver"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:349
+#: nova/virt/vmwareapi/driver.py:350
 #, python-format
 msgid "VMware Cluster %s is not found"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:451
+#: nova/virt/vmwareapi/driver.py:453
 #, python-format
 msgid "In vmwareapi:_create_session, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:534
+#: nova/virt/vmwareapi/driver.py:536
 #, python-format
 msgid "In vmwareapi:_call_method, got this exception: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:570
+#: nova/virt/vmwareapi/driver.py:572
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: success"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:575
+#: nova/virt/vmwareapi/driver.py:577
 #, python-format
 msgid "Task [%(task_name)s] %(task_ref)s status: error %(error_info)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/driver.py:579
+#: nova/virt/vmwareapi/driver.py:581
 #, python-format
 msgid "In vmwareapi:_poll_task, Got this error %s"
 msgstr ""
@@ -9750,34 +9805,34 @@ msgstr ""
 msgid "%(text)s: _db_content => %(content)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:133
+#: nova/virt/vmwareapi/fake.py:140
 #, python-format
 msgid "Property %(attr)s not set for the managed object %(name)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:494
+#: nova/virt/vmwareapi/fake.py:540
 msgid "There is no VM registered"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:496 nova/virt/vmwareapi/fake.py:673
+#: nova/virt/vmwareapi/fake.py:542 nova/virt/vmwareapi/fake.py:719
 #, python-format
 msgid "Virtual Machine with ref %s is not there"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:559
+#: nova/virt/vmwareapi/fake.py:605
 #, python-format
 msgid "Logging out a session that is invalid or already logged out: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:574
+#: nova/virt/vmwareapi/fake.py:620
 msgid "Session is faulty"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:577
+#: nova/virt/vmwareapi/fake.py:623
 msgid "Session Invalid"
 msgstr ""
 
-#: nova/virt/vmwareapi/fake.py:670
+#: nova/virt/vmwareapi/fake.py:716
 msgid "No Virtual Machine has been registered yet"
 msgstr ""
 
@@ -9989,11 +10044,11 @@ msgstr ""
 msgid "Did hard reboot of VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:944
+#: nova/virt/vmwareapi/vmops.py:634 nova/virt/vmwareapi/vmops.py:947
 msgid "Destroying the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:949
+#: nova/virt/vmwareapi/vmops.py:639 nova/virt/vmwareapi/vmops.py:952
 msgid "Destroyed the VM"
 msgstr ""
 
@@ -10098,100 +10153,100 @@ msgstr ""
 msgid "Powered on the VM"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:869
+#: nova/virt/vmwareapi/vmops.py:872
 #, python-format
 msgid "Updating instance '%(instance_uuid)s' progress to %(progress)d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:898
+#: nova/virt/vmwareapi/vmops.py:901
 #, python-format
 msgid "Renaming the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:904
+#: nova/virt/vmwareapi/vmops.py:907
 #, python-format
 msgid "Renamed the VM to %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:919
+#: nova/virt/vmwareapi/vmops.py:922
 #, python-format
 msgid "Cloning VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:927
+#: nova/virt/vmwareapi/vmops.py:930
 #, python-format
 msgid "Cloned VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:940
+#: nova/virt/vmwareapi/vmops.py:943
 msgid "instance not present"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:951
+#: nova/virt/vmwareapi/vmops.py:954
 #, python-format
 msgid ""
 "In vmwareapi:vmops:confirm_migration, got this exception while destroying"
 " the VM: %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:966
+#: nova/virt/vmwareapi/vmops.py:970
 #, python-format
 msgid "Renaming the VM from %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:972
+#: nova/virt/vmwareapi/vmops.py:976
 #, fuzzy, python-format
 msgid "Renamed the VM from %s"
 msgstr "找�到Volume %s"
 
-#: nova/virt/vmwareapi/vmops.py:997
+#: nova/virt/vmwareapi/vmops.py:1001
 #, python-format
 msgid "Migrating VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1009
+#: nova/virt/vmwareapi/vmops.py:1013
 #, python-format
 msgid "Migrated VM to host %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1019 nova/virt/xenapi/vmops.py:1386
+#: nova/virt/vmwareapi/vmops.py:1023 nova/virt/xenapi/vmops.py:1386
 #, python-format
 msgid "Found %(instance_count)d hung reboots older than %(timeout)d seconds"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1023
+#: nova/virt/vmwareapi/vmops.py:1027
 #, python-format
 msgid "Automatically hard rebooting %d"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1057
+#: nova/virt/vmwareapi/vmops.py:1061
 msgid "get_diagnostics not implemented for vmwareapi"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1134
+#: nova/virt/vmwareapi/vmops.py:1138
 msgid "Reconfiguring VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1140
+#: nova/virt/vmwareapi/vmops.py:1144
 msgid "Reconfigured VM instance to set the machine id"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1152
+#: nova/virt/vmwareapi/vmops.py:1156
 #, python-format
 msgid "Reconfiguring VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1159
+#: nova/virt/vmwareapi/vmops.py:1163
 #, python-format
 msgid "Reconfigured VM instance to enable vnc on port - %(port)s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1252
+#: nova/virt/vmwareapi/vmops.py:1256
 #, python-format
 msgid "Creating directory with path %s"
 msgstr ""
 
-#: nova/virt/vmwareapi/vmops.py:1258
+#: nova/virt/vmwareapi/vmops.py:1262
 #, python-format
 msgid "Created directory with path %s"
 msgstr ""
@@ -10314,106 +10369,87 @@ msgstr "無法�載 Volume %s"
 msgid "Mountpoint %(mountpoint)s detached from instance %(instance_name)s"
 msgstr "掛載點 %(mountpoint)s 從虛擬機器 %(instance_name)s �載"
 
-#: nova/virt/xenapi/agent.py:101 nova/virt/xenapi/vmops.py:1640
+#: nova/virt/xenapi/agent.py:102 nova/virt/xenapi/vmops.py:1640
 #, python-format
 msgid "TIMEOUT: The call to %(method)s timed out. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:106 nova/virt/xenapi/vmops.py:1645
+#: nova/virt/xenapi/agent.py:107 nova/virt/xenapi/vmops.py:1645
 #, 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:111 nova/virt/xenapi/vmops.py:1650
+#: nova/virt/xenapi/agent.py:112 nova/virt/xenapi/vmops.py:1650
 #, python-format
 msgid "The call to %(method)s returned an error: %(e)s. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:123
+#: nova/virt/xenapi/agent.py:122
 #, python-format
 msgid ""
 "The agent call to %(method)s returned an invalid response: %(ret)r. "
 "args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:134
+#: nova/virt/xenapi/agent.py:129
 #, python-format
-msgid "Failed to query agent version: %r"
+msgid "The agent call to %(method)s returned an an error: %(ret)r. args=%(args)r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:153
+#: nova/virt/xenapi/agent.py:155
 msgid "Querying agent version"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:167
-msgid "Reached maximum time attempting to query agent version"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:175
+#: nova/virt/xenapi/agent.py:174
 #, python-format
 msgid "Updating agent to %s"
 msgstr ""
 
 #: nova/virt/xenapi/agent.py:183
 #, python-format
-msgid "Failed to update agent: %r"
+msgid "Unable to update the agent due to: %(exc)s"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:197
+#: nova/virt/xenapi/agent.py:215
 msgid "Setting admin password"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:208 nova/virt/xenapi/agent.py:228
-#, python-format
-msgid "Failed to exchange keys: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:249
+#: nova/virt/xenapi/agent.py:231
 msgid "Skipping setting of ssh key for Windows."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:264
+#: nova/virt/xenapi/agent.py:247
 #, python-format
 msgid "Injecting file path: %r"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:277
-#, python-format
-msgid "Failed to inject file: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:284
+#: nova/virt/xenapi/agent.py:257
 msgid "Resetting network"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:290
-#, python-format
-msgid "Failed to reset network: %r"
-msgstr ""
-
-#: nova/virt/xenapi/agent.py:313
+#: nova/virt/xenapi/agent.py:279
 msgid ""
 "XenServer tools installed in this image are capable of network injection."
 "  Networking files will not bemanipulated"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:321
+#: nova/virt/xenapi/agent.py:287
 msgid ""
 "XenServer tools are present in this image but are not capable of network "
 "injection"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:325
+#: nova/virt/xenapi/agent.py:291
 msgid "XenServer tools are not installed in this image"
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:339
+#: nova/virt/xenapi/agent.py:305
 msgid "Invalid 'agent_present' value. Falling back to the default."
 msgstr ""
 
-#: nova/virt/xenapi/agent.py:392
+#: nova/virt/xenapi/agent.py:358
 #, python-format
 msgid "OpenSSL error: %s"
 msgstr ""
@@ -10429,54 +10465,54 @@ msgstr ""
 msgid "Failure while cleaning up attached VDIs"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:348
+#: nova/virt/xenapi/driver.py:349
 #, python-format
 msgid "Could not determine key: %s"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:571
+#: nova/virt/xenapi/driver.py:572
 msgid "Host startup on XenServer is not supported."
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:632
+#: nova/virt/xenapi/driver.py:633
 msgid "Unable to log in to XenAPI (is the Dom0 disk full?)"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:672
+#: nova/virt/xenapi/driver.py:673
 msgid "Host is member of a pool, but DB says otherwise"
 msgstr ""
 
-#: nova/virt/xenapi/driver.py:757 nova/virt/xenapi/driver.py:771
+#: nova/virt/xenapi/driver.py:758 nova/virt/xenapi/driver.py:772
 #, python-format
 msgid "Got exception: %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:705 nova/virt/xenapi/fake.py:809
-#: nova/virt/xenapi/fake.py:828 nova/virt/xenapi/fake.py:896
+#: nova/virt/xenapi/fake.py:712 nova/virt/xenapi/fake.py:816
+#: nova/virt/xenapi/fake.py:835 nova/virt/xenapi/fake.py:903
 msgid "Raising NotImplemented"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:707
+#: nova/virt/xenapi/fake.py:714
 #, python-format
 msgid "xenapi.fake does not have an implementation for %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:740
+#: nova/virt/xenapi/fake.py:747
 #, python-format
 msgid "Calling %(name)s %(impl)s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:746
+#: nova/virt/xenapi/fake.py:753
 #, python-format
 msgid "Calling getter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:749
+#: nova/virt/xenapi/fake.py:756
 #, python-format
 msgid "Calling setter %s"
 msgstr ""
 
-#: nova/virt/xenapi/fake.py:811
+#: nova/virt/xenapi/fake.py:818
 #, python-format
 msgid ""
 "xenapi.fake does not have an implementation for %s or it has been called "
@@ -11364,9 +11400,3 @@ msgstr ""
 msgid "status must be 'available'"
 msgstr ""
 
-#~ msgid "Certificate %(certificate_id)s not found."
-#~ msgstr ""
-
-#~ msgid "quantum authentication failed"
-#~ msgstr ""
-
diff --git a/nova/network/linux_net.py b/nova/network/linux_net.py
index 15be3d3c4..db008cc93 100644
--- a/nova/network/linux_net.py
+++ b/nova/network/linux_net.py
@@ -1260,6 +1260,18 @@ def delete_ovs_vif_port(bridge, dev):
     delete_net_dev(dev)
 
 
+def create_ivs_vif_port(dev, iface_id, mac, instance_id):
+    utils.execute('ivs-ctl', 'add-port',
+                   dev, run_as_root=True)
+
+
+def delete_ivs_vif_port(dev):
+    utils.execute('ivs-ctl', 'del-port', dev,
+                  run_as_root=True)
+    utils.execute('ip', 'link', 'delete', dev,
+                  run_as_root=True)
+
+
 def create_tap_dev(dev, mac_address=None):
     if not device_exists(dev):
         try:
diff --git a/nova/network/model.py b/nova/network/model.py
index 4efa70ab6..ce8aa123b 100644
--- a/nova/network/model.py
+++ b/nova/network/model.py
@@ -30,6 +30,7 @@ def ensure_string_keys(d):
 
 # Constants for the 'vif_type' field in VIF class
 VIF_TYPE_OVS = 'ovs'
+VIF_TYPE_IVS = 'ivs'
 VIF_TYPE_BRIDGE = 'bridge'
 VIF_TYPE_802_QBG = '802.1qbg'
 VIF_TYPE_802_QBH = '802.1qbh'
diff --git a/nova/network/quantumv2/api.py b/nova/network/quantumv2/api.py
index e155f694a..c7f4ffd58 100644
--- a/nova/network/quantumv2/api.py
+++ b/nova/network/quantumv2/api.py
@@ -538,7 +538,7 @@ class API(base.Base):
     def get_all(self, context):
         """Get all networks for client."""
         client = quantumv2.get_client(context)
-        networks = client.list_networks().get('networks') or {}
+        networks = client.list_networks().get('networks')
         for network in networks:
             network['label'] = network['name']
         return networks
diff --git a/nova/network/security_group/quantum_driver.py b/nova/network/security_group/quantum_driver.py
index 7709da970..6e62d796d 100644
--- a/nova/network/security_group/quantum_driver.py
+++ b/nova/network/security_group/quantum_driver.py
@@ -17,6 +17,8 @@
 #
 # @author: Aaron Rosen, Nicira Networks, Inc.
 
+import sys
+
 from oslo.config import cfg
 from quantumclient.common import exceptions as q_exc
 from quantumclient.quantum import v2_0 as quantumv20
@@ -50,6 +52,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
             security_group = quantum.create_security_group(
                 body).get('security_group')
         except q_exc.QuantumClientException as e:
+            exc_info = sys.exc_info()
             LOG.exception(_("Quantum Error creating security group %s"),
                           name)
             if e.status_code == 401:
@@ -57,7 +60,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
                 # as this error code could be related to bad input or over
                 # quota
                 raise exc.HTTPBadRequest()
-            raise e
+            raise exc_info[0], exc_info[1], exc_info[2]
         return self._convert_to_nova_security_group_format(security_group)
 
     def update_security_group(self, context, security_group,
@@ -68,6 +71,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
             security_group = quantum.update_security_group(
                 security_group['id'], body).get('security_group')
         except q_exc.QuantumClientException as e:
+            exc_info = sys.exc_info()
             LOG.exception(_("Quantum Error updating security group %s"),
                           name)
             if e.status_code == 401:
@@ -75,7 +79,7 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
                 # as this error code could be related to bad input or over
                 # quota
                 raise exc.HTTPBadRequest()
-            raise e
+            raise exc_info[0], exc_info[1], exc_info[2]
         return self._convert_to_nova_security_group_format(security_group)
 
     def _convert_to_nova_security_group_format(self, security_group):
@@ -120,12 +124,13 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
                     quantum, 'security_group', name)
             group = quantum.show_security_group(id).get('security_group')
         except q_exc.QuantumClientException as e:
+            exc_info = sys.exc_info()
             if e.status_code == 404:
                 LOG.debug(_("Quantum security group %s not found"), name)
                 self.raise_not_found(e.message)
             else:
                 LOG.error(_("Quantum Error: %s"), e)
-                raise e
+                raise exc_info[0], exc_info[1], exc_info[2]
 
         return self._convert_to_nova_security_group_format(group)
 
@@ -143,9 +148,9 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
         try:
             security_groups = quantum.list_security_groups(**search_opts).get(
                 'security_groups')
-        except q_exc.QuantumClientException as e:
-            LOG.exception(_("Quantum Error getting security groups"))
-            raise e
+        except q_exc.QuantumClientException:
+            with excutils.save_and_reraise_exception():
+                LOG.exception(_("Quantum Error getting security groups"))
         converted_rules = []
         for security_group in security_groups:
             converted_rules.append(
@@ -165,13 +170,14 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
         try:
             quantum.delete_security_group(security_group['id'])
         except q_exc.QuantumClientException as e:
+            exc_info = sys.exc_info()
             if e.status_code == 404:
                 self.raise_not_found(e.message)
             elif e.status_code == 409:
                 self.raise_invalid_property(e.message)
             else:
                 LOG.error(_("Quantum Error: %s"), e)
-                raise e
+                raise exc_info[0], exc_info[1], exc_info[2]
 
     def add_rules(self, context, id, name, vals):
         """Add security group rule(s) to security group.
@@ -188,13 +194,14 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
             rules = quantum.create_security_group_rule(
                 body).get('security_group_rules')
         except q_exc.QuantumClientException as e:
+            exc_info = sys.exc_info()
             if e.status_code == 409:
                 LOG.exception(_("Quantum Error getting security group %s"),
                               name)
                 self.raise_not_found(e.message)
             else:
                 LOG.exception(_("Quantum Error:"))
-                raise e
+                raise exc_info[0], exc_info[1], exc_info[2]
         converted_rules = []
         for rule in rules:
             converted_rules.append(
@@ -246,9 +253,8 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
             for rule_id in range(0, len(rule_ids)):
                 quantum.delete_security_group_rule(rule_ids.pop())
         except q_exc.QuantumClientException as e:
-            LOG.exception(_("Quantum Error unable to delete %s"),
-                          rule_ids)
-            raise e
+            with excutils.save_and_reraise_exception():
+                LOG.exception(_("Quantum Error unable to delete %s"), rule_ids)
 
     def get_rule(self, context, id):
         quantum = quantumv2.get_client(context)
@@ -256,12 +262,13 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
             rule = quantum.show_security_group_rule(
                 id).get('security_group_rule')
         except q_exc.QuantumClientException as e:
+            exc_info = sys.exc_info()
             if e.status_code == 404:
                 LOG.debug(_("Quantum security group rule %s not found"), id)
                 self.raise_not_found(e.message)
             else:
                 LOG.error(_("Quantum Error: %s"), e)
-                raise e
+                raise exc_info[0], exc_info[1], exc_info[2]
         return self._convert_to_nova_security_group_rule_format(rule)
 
     def get_instances_security_groups_bindings(self, context):
@@ -350,19 +357,20 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
             security_group_id = quantumv20.find_resourceid_by_name_or_id(
                 quantum, 'security_group', security_group_name)
         except q_exc.QuantumClientException as e:
+            exc_info = sys.exc_info()
             if e.status_code == 404:
                 msg = ("Security group %s is not found for project %s" %
                        (security_group_name, context.project_id))
                 self.raise_not_found(msg)
             else:
                 LOG.exception(_("Quantum Error:"))
-                raise e
+                raise exc_info[0], exc_info[1], exc_info[2]
         params = {'device_id': instance['uuid']}
         try:
             ports = quantum.list_ports(**params).get('ports')
-        except q_exc.QuantumClientException as e:
+        except q_exc.QuantumClientException:
+            with excutils.save_and_reraise_exception():
                 LOG.exception(_("Quantum Error:"))
-                raise e
 
         if not ports:
             msg = ("instance_id %s could not be found as device id on"
@@ -398,19 +406,20 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
             security_group_id = quantumv20.find_resourceid_by_name_or_id(
                 quantum, 'security_group', security_group_name)
         except q_exc.QuantumClientException as e:
+            exc_info = sys.exc_info()
             if e.status_code == 404:
                 msg = ("Security group %s is not found for project %s" %
                        (security_group_name, context.project_id))
                 self.raise_not_found(msg)
             else:
                 LOG.exception(_("Quantum Error:"))
-                raise e
+                raise exc_info[0], exc_info[1], exc_info[2]
         params = {'device_id': instance['uuid']}
         try:
             ports = quantum.list_ports(**params).get('ports')
-        except q_exc.QuantumClientException as e:
+        except q_exc.QuantumClientException:
+            with excutils.save_and_reraise_exception():
                 LOG.exception(_("Quantum Error:"))
-                raise e
 
         if not ports:
             msg = ("instance_id %s could not be found as device id on"
@@ -438,8 +447,8 @@ class SecurityGroupAPI(security_group_base.SecurityGroupBase):
                 quantum.update_port(port['id'], {'port': updated_port})
                 found_security_group = True
             except Exception:
-                LOG.exception(_("Quantum Error:"))
-                raise e
+                with excutils.save_and_reraise_exception():
+                    LOG.exception(_("Quantum Error:"))
         if not found_security_group:
             msg = (_("Security group %(security_group_name)s not assocaited "
                      "with the instance %(instance)s"),
diff --git a/nova/objects/__init__.py b/nova/objects/__init__.py
index 00f8240f1..47f14f68a 100644
--- a/nova/objects/__init__.py
+++ b/nova/objects/__init__.py
@@ -19,3 +19,4 @@ def register_all():
     # need to receive it via RPC.
     __import__('nova.objects.instance')
     __import__('nova.objects.instance_info_cache')
+    __import__('nova.objects.security_group')
diff --git a/nova/objects/base.py b/nova/objects/base.py
index f5fc37e03..c6dc8cc1a 100644
--- a/nova/objects/base.py
+++ b/nova/objects/base.py
@@ -353,6 +353,13 @@ class NovaObject(object):
         """
         setattr(self, name, value)
 
+    def __contains__(self, name):
+        """For backwards-compatibility with dict-based objects.
+
+        NOTE(danms): May be removed in the future.
+        """
+        return hasattr(self, get_attrname(name))
+
     def get(self, key, value=None):
         """For backwards-compatibility with dict-based objects.
 
@@ -360,6 +367,14 @@ class NovaObject(object):
         """
         return self[key]
 
+    def update(self, updates):
+        """For backwards-compatibility with dict-base objects.
+
+        NOTE(danms): May be removed in the future.
+        """
+        for key, value in updates.items():
+            self[key] = value
+
 
 class ObjectListBase(object):
     """Mixin class for lists of objects.
@@ -425,13 +440,52 @@ class NovaObjectSerializer(nova.openstack.common.rpc.serializer.Serializer):
     that needs to accept or return NovaObjects as arguments or result values
     should pass this to its RpcProxy and RpcDispatcher objects.
     """
+    def _process_iterable(self, context, action_fn, values):
+        """Process an iterable, taking an action on each value.
+        :param:context: Request context
+        :param:action_fn: Action to take on each item in values
+        :param:values: Iterable container of things to take action on
+        :returns: A new container of the same type (except set) with
+                  items from values having had action applied.
+        """
+        iterable = values.__class__
+        if iterable == set:
+            # NOTE(danms): A set can't have an unhashable value inside, such as
+            # a dict. Convert sets to tuples, which is fine, since we can't
+            # send them over RPC anyway.
+            iterable = tuple
+        return iterable([action_fn(context, value) for value in values])
+
     def serialize_entity(self, context, entity):
-        if (hasattr(entity, 'obj_to_primitive') and
-            callable(entity.obj_to_primitive)):
+        if isinstance(entity, (tuple, list, set)):
+            entity = self._process_iterable(context, self.serialize_entity,
+                                            entity)
+        elif (hasattr(entity, 'obj_to_primitive') and
+              callable(entity.obj_to_primitive)):
             entity = entity.obj_to_primitive()
         return entity
 
     def deserialize_entity(self, context, entity):
         if isinstance(entity, dict) and 'nova_object.name' in entity:
             entity = NovaObject.obj_from_primitive(entity, context=context)
+        elif isinstance(entity, (tuple, list, set)):
+            entity = self._process_iterable(context, self.deserialize_entity,
+                                            entity)
         return entity
+
+
+def obj_to_primitive(obj):
+    """Recrusively turn an object into a python primitive.
+
+    A NovaObject becomes a dict, and anything that implements ObjectListBase
+    becomes a list.
+    """
+    if isinstance(obj, ObjectListBase):
+        return [obj_to_primitive(x) for x in obj]
+    elif isinstance(obj, NovaObject):
+        result = {}
+        for key, value in obj.iteritems():
+            result[key] = obj_to_primitive(value)
+        return result
+    else:
+        return obj
diff --git a/nova/objects/instance.py b/nova/objects/instance.py
index de47f648f..6a18736d1 100644
--- a/nova/objects/instance.py
+++ b/nova/objects/instance.py
@@ -15,7 +15,9 @@
 from nova import db
 from nova import notifications
 from nova.objects import base
+from nova.objects import instance_fault
 from nova.objects import instance_info_cache
+from nova.objects import security_group
 from nova.objects import utils as obj_utils
 from nova import utils
 
@@ -26,15 +28,20 @@ CONF = cfg.CONF
 
 
 # These are fields that can be specified as expected_attrs
-INSTANCE_OPTIONAL_FIELDS = ['metadata', 'system_metadata']
+INSTANCE_OPTIONAL_FIELDS = ['metadata', 'system_metadata', 'fault']
 # These are fields that are always joined by the db right now
-INSTANCE_IMPLIED_FIELDS = ['info_cache']
+INSTANCE_IMPLIED_FIELDS = ['info_cache', 'security_groups']
+# These are fields that are optional but don't translate to db columns
+INSTANCE_OPTIONAL_NON_COLUMNS = ['fault']
+# These are all fields that most query calls load by default
+INSTANCE_DEFAULT_FIELDS = INSTANCE_OPTIONAL_FIELDS + INSTANCE_IMPLIED_FIELDS
 
 
 class Instance(base.NovaObject):
     # Version 1.0: Initial version
     # Version 1.1: Added info_cache
-    VERSION = '1.1'
+    # Version 1.2: Added security_groups
+    VERSION = '1.2'
 
     fields = {
         'id': int,
@@ -106,7 +113,13 @@ class Instance(base.NovaObject):
         'system_metadata': dict,
 
         'info_cache': obj_utils.nested_object_or_none(
-            instance_info_cache.InstanceInfoCache)
+            instance_info_cache.InstanceInfoCache),
+
+        'security_groups': obj_utils.nested_object_or_none(
+            security_group.SecurityGroupList),
+
+        'fault': obj_utils.nested_object_or_none(
+            instance_fault.InstanceFault),
 
         }
 
@@ -149,6 +162,8 @@ class Instance(base.NovaObject):
     _attr_launched_at_to_primitive = obj_utils.dt_serializer('launched_at')
     _attr_terminated_at_to_primitive = obj_utils.dt_serializer('terminated_at')
     _attr_info_cache_to_primitive = obj_utils.obj_serializer('info_cache')
+    _attr_security_groups_to_primitive = obj_utils.obj_serializer(
+        'security_groups')
 
     _attr_scheduled_at_from_primitive = obj_utils.dt_deserializer
     _attr_launched_at_from_primitive = obj_utils.dt_deserializer
@@ -157,8 +172,11 @@ class Instance(base.NovaObject):
     def _attr_info_cache_from_primitive(self, val):
         return base.NovaObject.obj_from_primitive(val)
 
+    def _attr_security_groups_from_primitive(self, val):
+        return base.NovaObject.obj_from_primitive(val)
+
     @staticmethod
-    def _from_db_object(instance, db_inst, expected_attrs=None):
+    def _from_db_object(context, instance, db_inst, expected_attrs=None):
         """Method to help with migration to objects.
 
         Converts a database entity to a formal object.
@@ -179,14 +197,24 @@ class Instance(base.NovaObject):
         if 'system_metadata' in expected_attrs:
             instance['system_metadata'] = utils.metadata_to_dict(
                 db_inst['system_metadata'])
+        if 'fault' in expected_attrs:
+            instance['fault'] = (
+                instance_fault.InstanceFault.get_latest_for_instance(
+                    context, instance.uuid))
         # NOTE(danms): info_cache and security_groups are almost always joined
         # in the DB layer right now, so check to see if they're filled instead
         # of looking at expected_attrs
         if db_inst['info_cache']:
             instance['info_cache'] = instance_info_cache.InstanceInfoCache()
             instance_info_cache.InstanceInfoCache._from_db_object(
-                instance['info_cache'], db_inst['info_cache'])
-
+                    context, instance['info_cache'], db_inst['info_cache'])
+        if db_inst['security_groups']:
+            instance['security_groups'] = security_group.SecurityGroupList()
+            security_group._make_secgroup_list(context,
+                                               instance['security_groups'],
+                                               db_inst['security_groups'])
+
+        instance._context = context
         instance.obj_reset_changes()
         return instance
 
@@ -207,7 +235,19 @@ class Instance(base.NovaObject):
 
         db_inst = db.instance_get_by_uuid(context, uuid,
                                           columns_to_join)
-        return Instance._from_db_object(cls(), db_inst, expected_attrs)
+        return Instance._from_db_object(context, cls(), db_inst,
+                                        expected_attrs)
+
+    def _save_info_cache(self, context):
+        self.info_cache.save(context)
+
+    def _save_security_groups(self, context):
+        for secgroup in self.security_groups:
+            secgroup.save(context)
+
+    def _save_instance_fault(self, context):
+        # NOTE(danms): I don't think we need to worry about this, do we?
+        pass
 
     @base.remotable
     def save(self, context, expected_task_state=None):
@@ -226,7 +266,7 @@ class Instance(base.NovaObject):
         for field in self.fields:
             if (hasattr(self, base.get_attrname(field)) and
                 isinstance(self[field], base.NovaObject)):
-                self[field].save(context)
+                getattr(self, '_save_%s' % field)(context)
             elif field in changes:
                 updates[field] = self[field]
         if expected_task_state is not None:
@@ -240,7 +280,7 @@ class Instance(base.NovaObject):
             for attr in INSTANCE_OPTIONAL_FIELDS:
                 if hasattr(self, base.get_attrname(attr)):
                     expected_attrs.append(attr)
-            Instance._from_db_object(self, inst_ref, expected_attrs)
+            Instance._from_db_object(context, self, inst_ref, expected_attrs)
             if 'vm_state' in changes or 'task_state' in changes:
                 notifications.send_update(context, old_ref, inst_ref)
 
@@ -268,6 +308,10 @@ class Instance(base.NovaObject):
             extra.append('metadata')
         elif attrname == 'info_cache':
             extra.append('info_cache')
+        elif attrname == 'security_groups':
+            extra.append('security_groups')
+        elif attrname == 'fault':
+            extra.append('fault')
 
         if not extra:
             raise Exception('Cannot load "%s" from instance' % attrname)
@@ -280,32 +324,52 @@ class Instance(base.NovaObject):
 
 
 def _make_instance_list(context, inst_list, db_inst_list, expected_attrs):
+    get_fault = expected_attrs and 'fault' in expected_attrs
+    inst_faults = {}
+    if get_fault:
+        # Build an instance_uuid:latest-fault mapping
+        expected_attrs.remove('fault')
+        instance_uuids = [inst['uuid'] for inst in db_inst_list]
+        faults = instance_fault.InstanceFaultList.get_by_instance_uuids(
+            context, instance_uuids)
+        for fault in faults:
+            if fault.instance_uuid not in inst_faults:
+                inst_faults[fault.instance_uuid] = fault
+
     inst_list.objects = []
     for db_inst in db_inst_list:
-        inst_obj = Instance._from_db_object(Instance(), db_inst,
+        inst_obj = Instance._from_db_object(context, Instance(), db_inst,
                                             expected_attrs=expected_attrs)
-        inst_obj._context = context
+        if get_fault:
+            inst_obj.fault = inst_faults.get(inst_obj.uuid, None)
         inst_list.objects.append(inst_obj)
     inst_list.obj_reset_changes()
     return inst_list
 
 
+def expected_cols(expected_attrs):
+    """Return expected_attrs that are columns needing joining."""
+    if expected_attrs:
+        return list(set(expected_attrs) - set(INSTANCE_OPTIONAL_NON_COLUMNS))
+    else:
+        return expected_attrs
+
+
 class InstanceList(base.ObjectListBase, base.NovaObject):
     @base.remotable_classmethod
     def get_by_filters(cls, context, filters,
                        sort_key=None, sort_dir=None, limit=None, marker=None,
                        expected_attrs=None):
         db_inst_list = db.instance_get_all_by_filters(
-            context, filters, sort_key, sort_dir, limit, marker,
-            columns_to_join=expected_attrs)
-
+            context, filters, sort_key, sort_dir, limit=limit, marker=marker,
+            columns_to_join=expected_cols(expected_attrs))
         return _make_instance_list(context, cls(), db_inst_list,
                                    expected_attrs)
 
     @base.remotable_classmethod
     def get_by_host(cls, context, host, expected_attrs=None):
         db_inst_list = db.instance_get_all_by_host(
-            context, host, columns_to_join=expected_attrs)
+            context, host, columns_to_join=expected_cols(expected_attrs))
         return _make_instance_list(context, cls(), db_inst_list,
                                    expected_attrs)
 
diff --git a/nova/objects/instance_fault.py b/nova/objects/instance_fault.py
new file mode 100644
index 000000000..d6f7a6140
--- /dev/null
+++ b/nova/objects/instance_fault.py
@@ -0,0 +1,61 @@
+#    Copyright 2013 IBM Corp.
+#
+#    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.
+
+from nova import db
+from nova.objects import base
+from nova.objects import utils as obj_utils
+
+
+class InstanceFault(base.NovaObject):
+    fields = {
+        'id': int,
+        'instance_uuid': str,
+        'code': int,
+        'message': obj_utils.str_or_none,
+        'details': obj_utils.str_or_none,
+        'host': obj_utils.str_or_none,
+        }
+
+    @staticmethod
+    def _from_db_object(fault, db_fault):
+        # NOTE(danms): These are identical right now
+        for key in fault.fields:
+            fault[key] = db_fault[key]
+        fault.obj_reset_changes()
+        return fault
+
+    @base.remotable_classmethod
+    def get_latest_for_instance(cls, context, instance_uuid):
+        db_faults = db.instance_fault_get_by_instance_uuids(context,
+                                                            [instance_uuid])
+        if instance_uuid in db_faults and db_faults[instance_uuid]:
+            return cls._from_db_object(cls(), db_faults[instance_uuid][0])
+
+
+def _make_fault_list(faultlist, db_faultlist):
+    faultlist.objects = []
+    for instance_uuid in db_faultlist:
+        for db_fault in db_faultlist[instance_uuid]:
+            faultlist.objects.append(InstanceFault._from_db_object(
+                InstanceFault(), db_fault))
+    faultlist.obj_reset_changes()
+    return faultlist
+
+
+class InstanceFaultList(base.ObjectListBase, base.NovaObject):
+    @base.remotable_classmethod
+    def get_by_instance_uuids(cls, context, instance_uuids):
+        db_faults = db.instance_fault_get_by_instance_uuids(context,
+                                                            instance_uuids)
+        return _make_fault_list(cls(), db_faults)
diff --git a/nova/objects/instance_info_cache.py b/nova/objects/instance_info_cache.py
index 6b46559ed..1f2db1223 100644
--- a/nova/objects/instance_info_cache.py
+++ b/nova/objects/instance_info_cache.py
@@ -14,25 +14,27 @@
 
 from nova import db
 from nova.objects import base
+from nova.objects import utils
 
 
 class InstanceInfoCache(base.NovaObject):
     fields = {
         'instance_uuid': str,
-        'network_info': str,
+        'network_info': utils.str_or_none,
         }
 
     @staticmethod
-    def _from_db_object(info_cache, db_obj):
+    def _from_db_object(context, info_cache, db_obj):
         info_cache.instance_uuid = db_obj['instance_uuid']
         info_cache.network_info = db_obj['network_info']
         info_cache.obj_reset_changes()
+        info_cache._context = context
         return info_cache
 
     @base.remotable_classmethod
     def get_by_instance_uuid(cls, context, instance_uuid):
         db_obj = db.instance_info_cache_get(context, instance_uuid)
-        return InstanceInfoCache._from_db_object(cls(), db_obj)
+        return InstanceInfoCache._from_db_object(context, cls(), db_obj)
 
     @base.remotable
     def save(self, context):
diff --git a/nova/objects/security_group.py b/nova/objects/security_group.py
new file mode 100644
index 000000000..ccf4f027e
--- /dev/null
+++ b/nova/objects/security_group.py
@@ -0,0 +1,95 @@
+#    Copyright 2013 IBM Corp.
+#
+#    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.
+
+from nova import db
+from nova.objects import base
+
+
+class SecurityGroup(base.NovaObject):
+    fields = {
+        'id': int,
+        'name': str,
+        'description': str,
+        'user_id': str,
+        'project_id': str,
+        }
+
+    @staticmethod
+    def _from_db_object(secgroup, db_secgroup):
+        # NOTE(danms): These are identical right now
+        for field in secgroup.fields:
+            secgroup[field] = db_secgroup[field]
+        secgroup.obj_reset_changes()
+        return secgroup
+
+    @base.remotable_classmethod
+    def get(cls, context, secgroup_id):
+        db_secgroup = db.security_group_get(context, secgroup_id)
+        return cls._from_db_object(cls(), db_secgroup)
+
+    @base.remotable_classmethod
+    def get_by_name(cls, context, project_id, group_name):
+        db_secgroup = db.security_group_get_by_name(context,
+                                                    project_id,
+                                                    group_name)
+        return cls._from_db_object(cls(), db_secgroup)
+
+    @base.remotable
+    def in_use(self, context):
+        return db.security_group_in_use(context, self.id)
+
+    @base.remotable
+    def save(self, context):
+        updates = {}
+        for field in self.obj_what_changed():
+            updates[field] = self[field]
+        if updates:
+            db_secgroup = db.security_group_update(context, self.id, updates)
+            SecurityGroup._from_db_object(self, db_secgroup)
+        self.obj_reset_changes()
+
+    @base.remotable
+    def refresh(self, context):
+        SecurityGroup._from_db_object(self,
+                                      db.security_group_get(context,
+                                                            self.id))
+
+
+def _make_secgroup_list(context, secgroup_list, db_secgroup_list):
+    secgroup_list.objects = []
+    for db_secgroup in db_secgroup_list:
+        secgroup = SecurityGroup._from_db_object(SecurityGroup(), db_secgroup)
+        secgroup._context = context
+        secgroup_list.objects.append(secgroup)
+    secgroup_list.obj_reset_changes()
+    return secgroup_list
+
+
+class SecurityGroupList(base.ObjectListBase, base.NovaObject):
+    @base.remotable_classmethod
+    def get_all(cls, context):
+        return _make_secgroup_list(context, cls(),
+                                   db.security_group_get_all(context))
+
+    @base.remotable_classmethod
+    def get_by_project(cls, context, project_id):
+        return _make_secgroup_list(context, cls(),
+                                   db.security_group_get_by_project(
+                                       context, project_id))
+
+    @base.remotable_classmethod
+    def get_by_instance(cls, context, instance):
+        return _make_secgroup_list(context, cls(),
+                                   db.security_group_get_by_instance(
+                                       context, instance.uuid))
diff --git a/nova/openstack/common/jsonutils.py b/nova/openstack/common/jsonutils.py
index 11af66daf..a260efad7 100644
--- a/nova/openstack/common/jsonutils.py
+++ b/nova/openstack/common/jsonutils.py
@@ -41,6 +41,7 @@ import json
 import types
 import xmlrpclib
 
+import netaddr
 import six
 
 from nova.openstack.common import timeutils
@@ -137,6 +138,8 @@ def to_primitive(value, convert_instances=False, convert_datetime=True,
             # Likely an instance of something. Watch for cycles.
             # Ignore class member vars.
             return recursive(value.__dict__, level=level + 1)
+        elif isinstance(value, netaddr.IPAddress):
+            return six.text_type(value)
         else:
             if any(test(value) for test in _nasty_type_tests):
                 return six.text_type(value)
diff --git a/nova/quota.py b/nova/quota.py
index a1c877ecc..d0241de1c 100644
--- a/nova/quota.py
+++ b/nova/quota.py
@@ -993,6 +993,7 @@ class QuotaEngine(object):
             # logged, however, because this is less than optimal.
             LOG.exception(_("Failed to commit reservations "
                             "%(reservations)s") % locals())
+            return
         LOG.debug(_("Committed reservations %(reservations)s") % locals())
 
     def rollback(self, context, reservations, project_id=None):
@@ -1015,6 +1016,7 @@ class QuotaEngine(object):
             # logged, however, because this is less than optimal.
             LOG.exception(_("Failed to roll back reservations "
                             "%(reservations)s") % locals())
+            return
         LOG.debug(_("Rolled back reservations %(reservations)s") % locals())
 
     def usage_reset(self, context, resources):
diff --git a/nova/scheduler/chance.py b/nova/scheduler/chance.py
index 0f8f3c45a..f0b1701e0 100644
--- a/nova/scheduler/chance.py
+++ b/nova/scheduler/chance.py
@@ -25,6 +25,7 @@ import random
 
 from oslo.config import cfg
 
+from nova.compute import rpcapi as compute_rpcapi
 from nova import exception
 from nova.scheduler import driver
 
@@ -35,6 +36,10 @@ CONF.import_opt('compute_topic', 'nova.compute.rpcapi')
 class ChanceScheduler(driver.Scheduler):
     """Implements Scheduler as a random node selector."""
 
+    def __init__(self, *args, **kwargs):
+        super(ChanceScheduler, self).__init__(*args, **kwargs)
+        self.compute_rpcapi = compute_rpcapi.ComputeAPI()
+
     def _filter_hosts(self, request_spec, hosts, filter_properties):
         """Filter a list of hosts based on request_spec."""
 
diff --git a/nova/scheduler/driver.py b/nova/scheduler/driver.py
index d5a1eedea..c4265285f 100644
--- a/nova/scheduler/driver.py
+++ b/nova/scheduler/driver.py
@@ -25,15 +25,11 @@ import sys
 
 from oslo.config import cfg
 
-from nova.compute import flavors
-from nova.compute import power_state
-from nova.compute import rpcapi as compute_rpcapi
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova.conductor import api as conductor_api
 from nova import db
 from nova import exception
-from nova.image import glance
 from nova import notifications
 from nova.openstack.common import importutils
 from nova.openstack.common import log as logging
@@ -122,9 +118,7 @@ class Scheduler(object):
     def __init__(self):
         self.host_manager = importutils.import_object(
                 CONF.scheduler_host_manager)
-        self.compute_rpcapi = compute_rpcapi.ComputeAPI()
         self.servicegroup_api = servicegroup.API()
-        self.image_service = glance.get_default_image_service()
 
     def update_service_capabilities(self, service_name, host, capabilities):
         """Process a capability update from a service node."""
@@ -168,189 +162,3 @@ class Scheduler(object):
         """Must override select_hosts method for scheduler to work."""
         msg = _("Driver must implement select_hosts")
         raise NotImplementedError(msg)
-
-    def schedule_live_migration(self, context, instance, dest,
-                                block_migration, disk_over_commit):
-        """Live migration scheduling method.
-
-        :param context:
-        :param instance: instance dict
-        :param dest: destination host
-        :param block_migration: if true, block_migration.
-        :param disk_over_commit: if True, consider real(not virtual)
-                                 disk size.
-
-        :return:
-            The host where instance is running currently.
-            Then scheduler send request that host.
-        """
-        # Check we can do live migration
-        self._live_migration_src_check(context, instance)
-
-        if dest is None:
-            # Let scheduler select a dest host, retry next best until success
-            # or no more valid hosts.
-            ignore_hosts = [instance['host']]
-            while dest is None:
-                dest = self._live_migration_dest_check(context, instance, dest,
-                                                       ignore_hosts)
-                try:
-                    self._live_migration_common_check(context, instance, dest)
-                    migrate_data = self.compute_rpcapi.\
-                        check_can_live_migrate_destination(context, instance,
-                                                           dest,
-                                                           block_migration,
-                                                           disk_over_commit)
-                except exception.Invalid:
-                    ignore_hosts.append(dest)
-                    dest = None
-                    continue
-        else:
-            # Test the given dest host
-            self._live_migration_dest_check(context, instance, dest)
-            self._live_migration_common_check(context, instance, dest)
-            migrate_data = self.compute_rpcapi.\
-                check_can_live_migrate_destination(context, instance, dest,
-                                                   block_migration,
-                                                   disk_over_commit)
-
-        # Perform migration
-        src = instance['host']
-        self.compute_rpcapi.live_migration(context, host=src,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                migrate_data=migrate_data)
-
-    def _live_migration_src_check(self, context, instance_ref):
-        """Live migration check routine (for src host).
-
-        :param context: security context
-        :param instance_ref: nova.db.sqlalchemy.models.Instance object
-
-        """
-        # TODO(johngar) why is this not in the API layer?
-        # Checking instance is running.
-        if instance_ref['power_state'] != power_state.RUNNING:
-            raise exception.InstanceNotRunning(
-                    instance_id=instance_ref['uuid'])
-
-        # Checking src host exists and compute node
-        src = instance_ref['host']
-        try:
-            service = db.service_get_by_compute_host(context, src)
-        except exception.NotFound:
-            raise exception.ComputeServiceUnavailable(host=src)
-
-        # Checking src host is alive.
-        if not self.servicegroup_api.service_is_up(service):
-            raise exception.ComputeServiceUnavailable(host=src)
-
-    def _live_migration_dest_check(self, context, instance_ref, dest,
-                                   ignore_hosts=None):
-        """Live migration check routine (for destination host).
-
-        :param context: security context
-        :param instance_ref: nova.db.sqlalchemy.models.Instance object
-        :param dest: destination host
-        :param ignore_hosts: hosts that should be avoided as dest host
-        """
-
-        # If dest is not specified, have scheduler pick one.
-        if dest is None:
-            instance_type = flavors.extract_flavor(instance_ref)
-            if not instance_ref['image_ref']:
-                image = None
-            else:
-                image = self.image_service.show(context,
-                                                instance_ref['image_ref'])
-            request_spec = {'instance_properties': instance_ref,
-                            'instance_type': instance_type,
-                            'instance_uuids': [instance_ref['uuid']],
-                            'image': image}
-            filter_properties = {'ignore_hosts': ignore_hosts}
-            return self.select_hosts(context, request_spec,
-                                     filter_properties)[0]
-
-        # Checking whether The host where instance is running
-        # and dest is not same.
-        src = instance_ref['host']
-        if dest == src:
-            raise exception.UnableToMigrateToSelf(
-                    instance_id=instance_ref['uuid'], host=dest)
-
-        # Checking dest exists and compute node.
-        try:
-            dservice_ref = db.service_get_by_compute_host(context, dest)
-        except exception.NotFound:
-            raise exception.ComputeServiceUnavailable(host=dest)
-
-        # Checking dest host is alive.
-        if not self.servicegroup_api.service_is_up(dservice_ref):
-            raise exception.ComputeServiceUnavailable(host=dest)
-
-        # Check memory requirements
-        self._assert_compute_node_has_enough_memory(context,
-                                                   instance_ref, dest)
-
-        return dest
-
-    def _live_migration_common_check(self, context, instance_ref, dest):
-        """Live migration common check routine.
-
-        The following checks are based on
-        http://wiki.libvirt.org/page/TodoPreMigrationChecks
-
-        :param context: security context
-        :param instance_ref: nova.db.sqlalchemy.models.Instance object
-        :param dest: destination host
-        """
-        dservice_ref = self._get_compute_info(context, dest)
-        src = instance_ref['host']
-        oservice_ref = self._get_compute_info(context, src)
-
-        # Checking hypervisor is same.
-        orig_hypervisor = oservice_ref['hypervisor_type']
-        dest_hypervisor = dservice_ref['hypervisor_type']
-        if orig_hypervisor != dest_hypervisor:
-            raise exception.InvalidHypervisorType()
-
-        # Checking hypervisor version.
-        orig_hypervisor = oservice_ref['hypervisor_version']
-        dest_hypervisor = dservice_ref['hypervisor_version']
-        if orig_hypervisor > dest_hypervisor:
-            raise exception.DestinationHypervisorTooOld()
-
-    def _assert_compute_node_has_enough_memory(self, context,
-                                              instance_ref, dest):
-        """Checks if destination host has enough memory for live migration.
-
-
-        :param context: security context
-        :param instance_ref: nova.db.sqlalchemy.models.Instance object
-        :param dest: destination host
-
-        """
-        # Getting total available memory of host
-        avail = self._get_compute_info(context, dest)['free_ram_mb']
-
-        mem_inst = instance_ref['memory_mb']
-        if not mem_inst or avail <= mem_inst:
-            instance_uuid = instance_ref['uuid']
-            reason = _("Unable to migrate %(instance_uuid)s to %(dest)s: "
-                       "Lack of memory(host:%(avail)s <= "
-                       "instance:%(mem_inst)s)")
-            raise exception.MigrationPreCheckError(reason=reason %
-                {'instance_uuid': instance_uuid, 'dest': dest, 'avail': avail,
-                 'mem_inst': mem_inst})
-
-    def _get_compute_info(self, context, host):
-        """get compute node's information specified by key
-
-        :param context: security context
-        :param host: hostname(must be compute node)
-        :param key: column name of compute_nodes
-        :return: value specified by key
-
-        """
-        service_ref = db.service_get_by_compute_host(context, host)
-        return service_ref['compute_node'][0]
diff --git a/nova/scheduler/filter_scheduler.py b/nova/scheduler/filter_scheduler.py
index 08cb6a20e..4e5662e65 100644
--- a/nova/scheduler/filter_scheduler.py
+++ b/nova/scheduler/filter_scheduler.py
@@ -24,6 +24,8 @@ import random
 from oslo.config import cfg
 
 from nova.compute import flavors
+from nova.compute import rpcapi as compute_rpcapi
+from nova import db
 from nova import exception
 from nova.openstack.common import log as logging
 from nova.openstack.common.notifier import api as notifier
@@ -54,6 +56,7 @@ class FilterScheduler(driver.Scheduler):
     def __init__(self, *args, **kwargs):
         super(FilterScheduler, self).__init__(*args, **kwargs)
         self.options = scheduler_options.SchedulerOptions()
+        self.compute_rpcapi = compute_rpcapi.ComputeAPI()
 
     def schedule_run_instance(self, context, request_spec,
                               admin_password, injected_files,
@@ -377,6 +380,17 @@ class FilterScheduler(driver.Scheduler):
                 filter_properties['group_hosts'].append(chosen_host.obj.host)
         return selected_hosts
 
+    def _get_compute_info(self, context, dest):
+        """Get compute node's information
+
+        :param context: security context
+        :param dest: hostname (must be compute node)
+        :return: dict of compute node information
+
+        """
+        service_ref = db.service_get_by_compute_host(context, dest)
+        return service_ref['compute_node'][0]
+
     def _assert_compute_node_has_enough_memory(self, context,
                                               instance_ref, dest):
         """Checks if destination host has enough memory for live migration.
diff --git a/nova/scheduler/manager.py b/nova/scheduler/manager.py
index 5c99feb03..2d63ee970 100644
--- a/nova/scheduler/manager.py
+++ b/nova/scheduler/manager.py
@@ -30,6 +30,7 @@ from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova.conductor import api as conductor_api
+from nova.conductor.tasks import live_migrate
 import nova.context
 from nova import exception
 from nova import manager
@@ -102,9 +103,8 @@ class SchedulerManager(manager.Manager):
     def live_migration(self, context, instance, dest,
                        block_migration, disk_over_commit):
         try:
-            return self.driver.schedule_live_migration(
-                context, instance, dest,
-                block_migration, disk_over_commit)
+            self._schedule_live_migration(context, instance, dest,
+                    block_migration, disk_over_commit)
         except (exception.NoValidHost,
                 exception.ComputeServiceUnavailable,
                 exception.InvalidHypervisorType,
@@ -131,6 +131,13 @@ class SchedulerManager(manager.Manager):
                                              {'vm_state': vm_states.ERROR},
                                              context, ex, request_spec)
 
+    def _schedule_live_migration(self, context, instance, dest,
+            block_migration, disk_over_commit):
+        task = live_migrate.LiveMigrationTask(context, instance,
+                    dest, block_migration, disk_over_commit,
+                    self.driver.select_hosts)
+        return task.execute()
+
     def run_instance(self, context, request_spec, admin_password,
             injected_files, requested_networks, is_first_time,
             filter_properties):
@@ -309,6 +316,7 @@ class SchedulerManager(manager.Manager):
     def get_backdoor_port(self, context):
         return self.backdoor_port
 
+    @rpc_common.client_exceptions(exception.NoValidHost)
     def select_hosts(self, context, request_spec, filter_properties):
         """Returns host(s) best suited for this request_spec
         and filter_properties.
diff --git a/nova/tests/api/ec2/test_cloud.py b/nova/tests/api/ec2/test_cloud.py
index 22a6947f2..c9e8ff42f 100644
--- a/nova/tests/api/ec2/test_cloud.py
+++ b/nova/tests/api/ec2/test_cloud.py
@@ -2124,6 +2124,7 @@ class CloudTestCase(test.TestCase):
             return [dict(id=1,
                          source_type='snapshot',
                          destination_type='volume',
+                         instance_uuid=inst_id,
                          snapshot_id=snapshots[0],
                          volume_id=volumes[0],
                          volume_size=1,
@@ -2137,7 +2138,8 @@ class CloudTestCase(test.TestCase):
 
         virt_driver = {}
 
-        def fake_power_on(self, instance):
+        def fake_power_on(self, context, instance, network_info,
+                          block_device_info):
             virt_driver['powered_on'] = True
 
         self.stubs.Set(fake_virt.FakeDriver, 'power_on', fake_power_on)
diff --git a/nova/tests/api/openstack/compute/contrib/test_coverage_ext.py b/nova/tests/api/openstack/compute/contrib/test_coverage_ext.py
index 957625b34..93a623bf6 100644
--- a/nova/tests/api/openstack/compute/contrib/test_coverage_ext.py
+++ b/nova/tests/api/openstack/compute/contrib/test_coverage_ext.py
@@ -12,7 +12,7 @@
 #    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
+#    under the License.
 
 import telnetlib
 
diff --git a/nova/tests/api/openstack/compute/contrib/test_evacuate.py b/nova/tests/api/openstack/compute/contrib/test_evacuate.py
index 816bac565..f2ebf9d78 100644
--- a/nova/tests/api/openstack/compute/contrib/test_evacuate.py
+++ b/nova/tests/api/openstack/compute/contrib/test_evacuate.py
@@ -76,8 +76,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -105,8 +105,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -132,8 +132,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -161,8 +161,8 @@ class EvacuateTest(test.TestCase):
         ctxt.project_id = 'fake'
         ctxt.is_admin = True
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
@@ -184,8 +184,8 @@ class EvacuateTest(test.TestCase):
     def test_not_admin(self):
         ctxt = context.RequestContext('fake', 'fake', is_admin=False)
         app = fakes.wsgi_app(fake_auth_context=ctxt)
-        uuid = self.UUID
-        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v2/fake/servers/%s/action' % uuid1)
         req.method = 'POST'
         req.body = jsonutils.dumps({
             'evacuate': {
diff --git a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
index df2c3d392..459dae932 100644
--- a/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
+++ b/nova/tests/api/openstack/compute/contrib/test_flavor_manage.py
@@ -218,3 +218,18 @@ class FlavorManageTest(test.TestCase):
         req.body = jsonutils.dumps(expected)
         res = req.get_response(self.app)
         self.assertEqual(res.status_int, 409)
+
+    def test_invalid_memory_mb(self):
+        """Check negative and decimal number can't be accepted."""
+
+        self.stubs.UnsetAll()
+        self.assertRaises(exception.InvalidInput, flavors.create, "abc",
+                          -512, 2, 1, 1, 1234, 512, 1, True)
+        self.assertRaises(exception.InvalidInput, flavors.create, "abcd",
+                          512.2, 2, 1, 1, 1234, 512, 1, True)
+        self.assertRaises(exception.InvalidInput, flavors.create, "abcde",
+                          None, 2, 1, 1, 1234, 512, 1, True)
+        self.assertRaises(exception.InvalidInput, flavors.create, "abcdef",
+                          512, 2, None, 1, 1234, 512, 1, True)
+        self.assertRaises(exception.InvalidInput, flavors.create, "abcdef",
+                          "test_memory_mb", 2, None, 1, 1234, 512, 1, True)
diff --git a/nova/tests/api/openstack/compute/contrib/test_security_groups.py b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
index f1433bd0a..ac3e8885d 100644
--- a/nova/tests/api/openstack/compute/contrib/test_security_groups.py
+++ b/nova/tests/api/openstack/compute/contrib/test_security_groups.py
@@ -716,7 +716,7 @@ class TestSecurityGroupRules(test.TestCase):
         db1 = security_group_db(self.sg1)
         db2 = security_group_db(self.sg2)
 
-        def return_security_group(context, group_id):
+        def return_security_group(context, group_id, columns_to_join=None):
             if group_id == db1['id']:
                 return db1
             if group_id == db2['id']:
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_agents.py b/nova/tests/api/openstack/compute/plugins/v3/test_agents.py
new file mode 100644
index 000000000..0154ada9e
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_agents.py
@@ -0,0 +1,181 @@
+# Copyright 2012 IBM Corp.
+#
+#    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.
+
+
+from nova.api.openstack.compute.contrib import agents
+from nova import context
+from nova import db
+from nova.db.sqlalchemy import models
+from nova import test
+
+fake_agents_list = [{'hypervisor': 'kvm', 'os': 'win',
+                     'architecture': 'x86',
+                     'version': '7.0',
+                     'url': 'xxx://xxxx/xxx/xxx',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f545',
+                     'id': 1},
+                    {'hypervisor': 'kvm', 'os': 'linux',
+                     'architecture': 'x86',
+                     'version': '16.0',
+                     'url': 'xxx://xxxx/xxx/xxx1',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f546',
+                     'id': 2},
+                    {'hypervisor': 'xen', 'os': 'linux',
+                     'architecture': 'x86',
+                     'version': '16.0',
+                     'url': 'xxx://xxxx/xxx/xxx2',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f547',
+                     'id': 3},
+                    {'hypervisor': 'xen', 'os': 'win',
+                     'architecture': 'power',
+                     'version': '7.0',
+                     'url': 'xxx://xxxx/xxx/xxx3',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f548',
+                     'id': 4},
+                    ]
+
+
+def fake_agent_build_get_all(context, hypervisor):
+    agent_build_all = []
+    for agent in fake_agents_list:
+        if hypervisor and hypervisor != agent['hypervisor']:
+            continue
+        agent_build_ref = models.AgentBuild()
+        agent_build_ref.update(agent)
+        agent_build_all.append(agent_build_ref)
+    return agent_build_all
+
+
+def fake_agent_build_update(context, agent_build_id, values):
+    pass
+
+
+def fake_agent_build_destroy(context, agent_update_id):
+    pass
+
+
+def fake_agent_build_create(context, values):
+    values['id'] = 1
+    agent_build_ref = models.AgentBuild()
+    agent_build_ref.update(values)
+    return agent_build_ref
+
+
+class FakeRequest(object):
+    environ = {"nova.context": context.get_admin_context()}
+    GET = {}
+
+
+class FakeRequestWithHypervisor(object):
+    environ = {"nova.context": context.get_admin_context()}
+    GET = {'hypervisor': 'kvm'}
+
+
+class AgentsTest(test.TestCase):
+
+    def setUp(self):
+        super(AgentsTest, self).setUp()
+
+        self.stubs.Set(db, "agent_build_get_all",
+                       fake_agent_build_get_all)
+        self.stubs.Set(db, "agent_build_update",
+                       fake_agent_build_update)
+        self.stubs.Set(db, "agent_build_destroy",
+                       fake_agent_build_destroy)
+        self.stubs.Set(db, "agent_build_create",
+                       fake_agent_build_create)
+        self.context = context.get_admin_context()
+        self.controller = agents.AgentController()
+
+    def test_agents_create(self):
+        req = FakeRequest()
+        body = {'agent': {'hypervisor': 'kvm',
+                'os': 'win',
+                'architecture': 'x86',
+                'version': '7.0',
+                'url': 'xxx://xxxx/xxx/xxx',
+                'md5hash': 'add6bb58e139be103324d04d82d8f545'}}
+        response = {'agent': {'hypervisor': 'kvm',
+                    'os': 'win',
+                    'architecture': 'x86',
+                    'version': '7.0',
+                    'url': 'xxx://xxxx/xxx/xxx',
+                    'md5hash': 'add6bb58e139be103324d04d82d8f545',
+                    'agent_id': 1}}
+        res_dict = self.controller.create(req, body)
+        self.assertEqual(res_dict, response)
+
+    def test_agents_delete(self):
+        req = FakeRequest()
+        self.controller.delete(req, 1)
+
+    def test_agents_list(self):
+        req = FakeRequest()
+        res_dict = self.controller.index(req)
+        agents_list = [{'hypervisor': 'kvm', 'os': 'win',
+                     'architecture': 'x86',
+                     'version': '7.0',
+                     'url': 'xxx://xxxx/xxx/xxx',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f545',
+                     'agent_id': 1},
+                    {'hypervisor': 'kvm', 'os': 'linux',
+                     'architecture': 'x86',
+                     'version': '16.0',
+                     'url': 'xxx://xxxx/xxx/xxx1',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f546',
+                     'agent_id': 2},
+                    {'hypervisor': 'xen', 'os': 'linux',
+                     'architecture': 'x86',
+                     'version': '16.0',
+                     'url': 'xxx://xxxx/xxx/xxx2',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f547',
+                     'agent_id': 3},
+                    {'hypervisor': 'xen', 'os': 'win',
+                     'architecture': 'power',
+                     'version': '7.0',
+                     'url': 'xxx://xxxx/xxx/xxx3',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f548',
+                     'agent_id': 4},
+                    ]
+        self.assertEqual(res_dict, {'agents': agents_list})
+
+    def test_agents_list_with_hypervisor(self):
+        req = FakeRequestWithHypervisor()
+        res_dict = self.controller.index(req)
+        response = [{'hypervisor': 'kvm', 'os': 'win',
+                     'architecture': 'x86',
+                     'version': '7.0',
+                     'url': 'xxx://xxxx/xxx/xxx',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f545',
+                     'agent_id': 1},
+                    {'hypervisor': 'kvm', 'os': 'linux',
+                     'architecture': 'x86',
+                     'version': '16.0',
+                     'url': 'xxx://xxxx/xxx/xxx1',
+                     'md5hash': 'add6bb58e139be103324d04d82d8f546',
+                     'agent_id': 2},
+                    ]
+        self.assertEqual(res_dict, {'agents': response})
+
+    def test_agents_update(self):
+        req = FakeRequest()
+        body = {'para': {'version': '7.0',
+                'url': 'xxx://xxxx/xxx/xxx',
+                'md5hash': 'add6bb58e139be103324d04d82d8f545'}}
+        response = {'agent': {'agent_id': 1,
+                    'version': '7.0',
+                    'url': 'xxx://xxxx/xxx/xxx',
+                    'md5hash': 'add6bb58e139be103324d04d82d8f545'}}
+        res_dict = self.controller.update(req, 1, body)
+        self.assertEqual(res_dict, response)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py
new file mode 100644
index 000000000..72a531277
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_evacuate.py
@@ -0,0 +1,198 @@
+#   Copyright 2013 OpenStack Foundation
+#
+#   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 uuid
+
+from oslo.config import cfg
+import webob
+
+from nova.compute import api as compute_api
+from nova.compute import vm_states
+from nova import context
+from nova.openstack.common import jsonutils
+from nova import test
+from nova.tests.api.openstack import fakes
+
+CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.utils')
+
+
+def fake_compute_api(*args, **kwargs):
+    return True
+
+
+def fake_compute_api_get(self, context, instance_id):
+    return {
+        'id': 1,
+        'uuid': instance_id,
+        'vm_state': vm_states.ACTIVE,
+        'task_state': None, 'host': 'host1'
+    }
+
+
+class EvacuateTest(test.TestCase):
+
+    _methods = ('resize', 'evacuate')
+
+    def setUp(self):
+        super(EvacuateTest, self).setUp()
+        self.stubs.Set(compute_api.API, 'get', fake_compute_api_get)
+        self.UUID = uuid.uuid4()
+        for _method in self._methods:
+            self.stubs.Set(compute_api.API, _method, fake_compute_api)
+
+    def test_evacuate_instance_with_no_target(self):
+        ctxt = context.get_admin_context()
+        ctxt.user_id = 'fake'
+        ctxt.project_id = 'fake'
+        ctxt.is_admin = True
+        app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
+        req = webob.Request.blank('/v3/servers/%s/action' % self.UUID)
+        req.method = 'POST'
+        req.body = jsonutils.dumps({
+            'evacuate': {
+                'onSharedStorage': 'False',
+                'adminPass': 'MyNewPass'
+            }
+        })
+        req.content_type = 'application/json'
+        res = req.get_response(app)
+        self.assertEqual(res.status_int, 400)
+
+    def test_evacuate_instance_with_target(self):
+        ctxt = context.get_admin_context()
+        ctxt.user_id = 'fake'
+        ctxt.project_id = 'fake'
+        ctxt.is_admin = True
+        app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
+        req.method = 'POST'
+        req.body = jsonutils.dumps({
+            'evacuate': {
+                'host': 'my_host',
+                'onSharedStorage': 'false',
+                'adminPass': 'MyNewPass'
+            }
+        })
+        req.content_type = 'application/json'
+
+        def fake_update(inst, context, instance,
+                        task_state, expected_task_state):
+            return None
+
+        self.stubs.Set(compute_api.API, 'update', fake_update)
+
+        resp = req.get_response(app)
+        self.assertEqual(resp.status_int, 200)
+        resp_json = jsonutils.loads(resp.body)
+        self.assertEqual("MyNewPass", resp_json['adminPass'])
+
+    def test_evacuate_shared_and_pass(self):
+        ctxt = context.get_admin_context()
+        ctxt.user_id = 'fake'
+        ctxt.project_id = 'fake'
+        ctxt.is_admin = True
+        app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
+        req.method = 'POST'
+        req.body = jsonutils.dumps({
+            'evacuate': {
+                'host': 'my_host',
+                'onSharedStorage': 'True',
+                'adminPass': 'MyNewPass'
+            }
+        })
+        req.content_type = 'application/json'
+
+        def fake_update(inst, context, instance,
+                        task_state, expected_task_state):
+            return None
+
+        self.stubs.Set(compute_api.API, 'update', fake_update)
+
+        res = req.get_response(app)
+        self.assertEqual(res.status_int, 400)
+
+    def test_evacuate_not_shared_pass_generated(self):
+        ctxt = context.get_admin_context()
+        ctxt.user_id = 'fake'
+        ctxt.project_id = 'fake'
+        ctxt.is_admin = True
+        app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
+        req.method = 'POST'
+        req.body = jsonutils.dumps({
+            'evacuate': {
+                'host': 'my_host',
+                'onSharedStorage': 'False',
+            }
+        })
+
+        req.content_type = 'application/json'
+
+        def fake_update(inst, context, instance,
+                        task_state, expected_task_state):
+            return None
+
+        self.stubs.Set(compute_api.API, 'update', fake_update)
+
+        resp = req.get_response(app)
+        self.assertEqual(resp.status_int, 200)
+        resp_json = jsonutils.loads(resp.body)
+        self.assertEqual(CONF.password_length, len(resp_json['adminPass']))
+
+    def test_evacuate_shared(self):
+        ctxt = context.get_admin_context()
+        ctxt.user_id = 'fake'
+        ctxt.project_id = 'fake'
+        ctxt.is_admin = True
+        app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
+        req.method = 'POST'
+        req.body = jsonutils.dumps({
+            'evacuate': {
+                'host': 'my_host',
+                'onSharedStorage': 'True',
+            }
+        })
+        req.content_type = 'application/json'
+
+        def fake_update(inst, context, instance,
+                        task_state, expected_task_state):
+            return None
+
+        self.stubs.Set(compute_api.API, 'update', fake_update)
+
+        res = req.get_response(app)
+        self.assertEqual(res.status_int, 200)
+
+    def test_not_admin(self):
+        ctxt = context.RequestContext('fake', 'fake', is_admin=False)
+        app = fakes.wsgi_app_v3(fake_auth_context=ctxt)
+        uuid1 = self.UUID
+        req = webob.Request.blank('/v3/servers/%s/action' % uuid1)
+        req.method = 'POST'
+        req.body = jsonutils.dumps({
+            'evacuate': {
+                'host': 'my_host',
+                'onSharedStorage': 'True',
+            }
+        })
+        req.content_type = 'application/json'
+        res = req.get_response(app)
+        self.assertEqual(res.status_int, 403)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py b/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py
new file mode 100644
index 000000000..a19d28064
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_extension_info.py
@@ -0,0 +1,108 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2013 IBM Corp.
+#
+#    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.
+
+from nova.api.openstack.compute import plugins
+from nova.api.openstack.compute.plugins.v3 import extension_info
+from nova import exception
+from nova import policy
+from nova import test
+from nova.tests.api.openstack import fakes
+
+
+class fake_extension(object):
+    def __init__(self, name, alias, description, namespace, version):
+        self.name = name
+        self.alias = alias
+        self.__doc__ = description
+        self.namespace = namespace
+        self.version = version
+
+
+fake_extensions = {
+    'ext1-alias': fake_extension('ext1', 'ext1-alias', 'ext1 description',
+                           'ext1 namespace', 1),
+    'ext2-alias': fake_extension('ext2', 'ext2-alias', 'ext2 description',
+                           'ext2 namespace', 2),
+    'ext3-alias': fake_extension('ext3', 'ext3-alias', 'ext3 description',
+                           'ext3 namespace', 1)
+}
+
+def fake_policy_enforce(context, action, target, do_raise=True):
+    return True
+
+def fake_policy_enforce_selective(context, action, target, do_raise=True):
+    if action == 'compute_extension:v3:ext1-alias:discoverable':
+        raise exception.NotAuthorized
+    else:
+        return True
+
+
+class ExtensionInfoTest(test.TestCase):
+
+    def setUp(self):
+        super(ExtensionInfoTest, self).setUp()
+        ext_info = plugins.LoadedExtensionInfo()
+        ext_info.extensions = fake_extensions
+        self.controller = extension_info.ExtensionInfoController(ext_info)
+
+    def test_extension_info_list(self):
+        self.stubs.Set(policy, 'enforce', fake_policy_enforce)
+        req = fakes.HTTPRequestV3.blank('/extensions')
+        res_dict = self.controller.index(req)
+        self.assertEqual(3, len(res_dict['extensions']))
+        for e in res_dict['extensions']:
+            self.assertIn(e['alias'], fake_extensions)
+            self.assertEqual(e['name'], fake_extensions[e['alias']].name)
+            self.assertEqual(e['alias'], fake_extensions[e['alias']].alias)
+            self.assertEqual(e['description'],
+                             fake_extensions[e['alias']].__doc__)
+            self.assertEqual(e['namespace'],
+                             fake_extensions[e['alias']].namespace)
+            self.assertEqual(e['version'],
+                             fake_extensions[e['alias']].version)
+
+    def test_extension_info_show(self):
+        self.stubs.Set(policy, 'enforce', fake_policy_enforce)
+        req = fakes.HTTPRequestV3.blank('/extensions/ext1-alias')
+        res_dict = self.controller.show(req, 'ext1-alias')
+        self.assertEqual(1, len(res_dict))
+        self.assertEqual(res_dict['extension']['name'],
+                         fake_extensions['ext1-alias'].name)
+        self.assertEqual(res_dict['extension']['alias'],
+                         fake_extensions['ext1-alias'].alias)
+        self.assertEqual(res_dict['extension']['description'],
+                         fake_extensions['ext1-alias'].__doc__)
+        self.assertEqual(res_dict['extension']['namespace'],
+                         fake_extensions['ext1-alias'].namespace)
+        self.assertEqual(res_dict['extension']['version'],
+                         fake_extensions['ext1-alias'].version)
+
+    def test_extension_info_list_not_all_discoverable(self):
+        self.stubs.Set(policy, 'enforce', fake_policy_enforce_selective)
+        req = fakes.HTTPRequestV3.blank('/extensions')
+        res_dict = self.controller.index(req)
+        self.assertEqual(2, len(res_dict['extensions']))
+        for e in res_dict['extensions']:
+            self.assertNotEqual('ext1-alias', e['alias'])
+            self.assertIn(e['alias'], fake_extensions)
+            self.assertEqual(e['name'], fake_extensions[e['alias']].name)
+            self.assertEqual(e['alias'], fake_extensions[e['alias']].alias)
+            self.assertEqual(e['description'],
+                             fake_extensions[e['alias']].__doc__)
+            self.assertEqual(e['namespace'],
+                             fake_extensions[e['alias']].namespace)
+            self.assertEqual(e['version'],
+                             fake_extensions[e['alias']].version)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py
new file mode 100644
index 000000000..7d9ec93df
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_access.py
@@ -0,0 +1,308 @@
+# Copyright 2012 OpenStack Foundation
+# 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 datetime
+
+from lxml import etree
+from webob import exc
+
+from nova.api.openstack.compute.plugins.v3 import flavor_access
+from nova.api.openstack.compute import flavors as flavors_api
+from nova.compute import flavors
+from nova import context
+from nova import exception
+from nova import test
+from nova.tests.api.openstack import fakes
+
+
+def generate_flavor(flavorid, ispublic):
+    return {
+        'id': flavorid,
+        'flavorid': str(flavorid),
+        'root_gb': 1,
+        'ephemeral_gb': 1,
+        'name': u'test',
+        'deleted': False,
+        'created_at': datetime.datetime(2012, 1, 1, 1, 1, 1, 1),
+        'updated_at': None,
+        'memory_mb': 512,
+        'vcpus': 1,
+        'swap': 512,
+        'rxtx_factor': 1.0,
+        'extra_specs': {},
+        'deleted_at': None,
+        'vcpu_weight': None,
+        'is_public': bool(ispublic)
+    }
+
+
+INSTANCE_TYPES = {
+        '0': generate_flavor(0, True),
+        '1': generate_flavor(1, True),
+        '2': generate_flavor(2, False),
+        '3': generate_flavor(3, False)}
+
+
+ACCESS_LIST = [{'flavor_id': '2', 'project_id': 'proj2'},
+               {'flavor_id': '2', 'project_id': 'proj3'},
+               {'flavor_id': '3', 'project_id': 'proj3'}]
+
+
+def fake_get_flavor_access_by_flavor_id(flavorid):
+    res = []
+    for access in ACCESS_LIST:
+        if access['flavor_id'] == flavorid:
+            res.append(access)
+    return res
+
+
+def fake_get_flavor_by_flavor_id(flavorid):
+    return INSTANCE_TYPES[flavorid]
+
+
+def _has_flavor_access(flavorid, projectid):
+    for access in ACCESS_LIST:
+        if access['flavor_id'] == flavorid and \
+           access['project_id'] == projectid:
+                return True
+    return False
+
+
+def fake_get_all_flavors(context, inactive=0, filters=None):
+    if filters == None or filters['is_public'] == None:
+        return INSTANCE_TYPES
+
+    res = {}
+    for k, v in INSTANCE_TYPES.iteritems():
+        if filters['is_public'] and _has_flavor_access(k, context.project_id):
+            res.update({k: v})
+            continue
+        if v['is_public'] == filters['is_public']:
+            res.update({k: v})
+
+    return res
+
+
+class FakeRequest(object):
+    environ = {"nova.context": context.get_admin_context()}
+
+    def get_db_flavor(self, flavor_id):
+        return INSTANCE_TYPES[flavor_id]
+
+
+class FakeResponse(object):
+    obj = {'flavor': {'id': '0'},
+           'flavors': [
+               {'id': '0'},
+               {'id': '2'}]
+    }
+
+    def attach(self, **kwargs):
+        pass
+
+
+class FlavorAccessTest(test.TestCase):
+    def setUp(self):
+        super(FlavorAccessTest, self).setUp()
+        self.flavor_controller = flavors_api.Controller()
+        self.flavor_access_controller = flavor_access.FlavorAccessController()
+        self.flavor_action_controller = flavor_access.FlavorActionController()
+        self.req = FakeRequest()
+        self.context = self.req.environ['nova.context']
+        self.stubs.Set(flavors, 'get_flavor_by_flavor_id',
+                       fake_get_flavor_by_flavor_id)
+        self.stubs.Set(flavors, 'get_all_flavors', fake_get_all_flavors)
+        self.stubs.Set(flavors, 'get_flavor_access_by_flavor_id',
+                       fake_get_flavor_access_by_flavor_id)
+
+    def _verify_flavor_list(self, result, expected):
+        # result already sorted by flavor_id
+        self.assertEqual(len(result), len(expected))
+
+        for d1, d2 in zip(result, expected):
+            self.assertEqual(d1['id'], d2['id'])
+
+    def test_list_flavor_access_public(self):
+        # query os-flavor-access on public flavor should return 404
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors/os-flavor-access',
+                                      use_admin_context=True)
+        self.assertRaises(exc.HTTPNotFound,
+                          self.flavor_access_controller.index,
+                          self.req, '1')
+
+    def test_list_flavor_access_private(self):
+        expected = {'flavor_access': [
+            {'flavor_id': '2', 'tenant_id': 'proj2'},
+            {'flavor_id': '2', 'tenant_id': 'proj3'}]}
+        result = self.flavor_access_controller.index(self.req, '2')
+        self.assertEqual(result, expected)
+
+    def test_list_flavor_with_admin_default_proj1(self):
+        expected = {'flavors': [{'id': '0'}, {'id': '1'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors',
+                                      use_admin_context=True)
+        req.environ['nova.context'].project_id = 'proj1'
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_admin_default_proj2(self):
+        expected = {'flavors': [{'id': '0'}, {'id': '1'}, {'id': '2'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors',
+                                      use_admin_context=True)
+        req.environ['nova.context'].project_id = 'proj2'
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_admin_ispublic_true(self):
+        expected = {'flavors': [{'id': '0'}, {'id': '1'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors?is_public=true',
+                                      use_admin_context=True)
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_admin_ispublic_false(self):
+        expected = {'flavors': [{'id': '2'}, {'id': '3'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors?is_public=false',
+                                      use_admin_context=True)
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_admin_ispublic_false_proj2(self):
+        expected = {'flavors': [{'id': '2'}, {'id': '3'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors?is_public=false',
+                                      use_admin_context=True)
+        req.environ['nova.context'].project_id = 'proj2'
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_admin_ispublic_none(self):
+        expected = {'flavors': [{'id': '0'}, {'id': '1'}, {'id': '2'},
+                                {'id': '3'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors?is_public=none',
+                                      use_admin_context=True)
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_no_admin_default(self):
+        expected = {'flavors': [{'id': '0'}, {'id': '1'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors',
+                                      use_admin_context=False)
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_no_admin_ispublic_true(self):
+        expected = {'flavors': [{'id': '0'}, {'id': '1'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors?is_public=true',
+                                      use_admin_context=False)
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_no_admin_ispublic_false(self):
+        expected = {'flavors': [{'id': '0'}, {'id': '1'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors?is_public=false',
+                                      use_admin_context=False)
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_list_flavor_with_no_admin_ispublic_none(self):
+        expected = {'flavors': [{'id': '0'}, {'id': '1'}]}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors?is_public=none',
+                                      use_admin_context=False)
+        result = self.flavor_controller.index(req)
+        self._verify_flavor_list(result['flavors'], expected['flavors'])
+
+    def test_show(self):
+        resp = FakeResponse()
+        self.flavor_action_controller.show(self.req, resp, '0')
+        self.assertEqual({'id': '0', 'os-flavor-access:is_public': True},
+                         resp.obj['flavor'])
+        self.flavor_action_controller.show(self.req, resp, '2')
+        self.assertEqual({'id': '0', 'os-flavor-access:is_public': False},
+                         resp.obj['flavor'])
+
+    def test_detail(self):
+        resp = FakeResponse()
+        self.flavor_action_controller.detail(self.req, resp)
+        self.assertEqual([{'id': '0', 'os-flavor-access:is_public': True},
+                          {'id': '2', 'os-flavor-access:is_public': False}],
+                         resp.obj['flavors'])
+
+    def test_create(self):
+        resp = FakeResponse()
+        self.flavor_action_controller.create(self.req, {}, resp)
+        self.assertEqual({'id': '0', 'os-flavor-access:is_public': True},
+                         resp.obj['flavor'])
+
+    def test_add_tenant_access(self):
+        def stub_add_flavor_access(flavorid, projectid, ctxt=None):
+            self.assertEqual('3', flavorid, "flavorid")
+            self.assertEqual("proj2", projectid, "projectid")
+        self.stubs.Set(flavors, 'add_flavor_access',
+                       stub_add_flavor_access)
+        expected = {'flavor_access':
+            [{'flavor_id': '3', 'tenant_id': 'proj3'}]}
+        body = {'addTenantAccess': {'tenant': 'proj2'}}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors/2/action',
+                                      use_admin_context=True)
+        result = self.flavor_action_controller.\
+            _addTenantAccess(req, '3', body)
+        self.assertEqual(result, expected)
+
+    def test_add_tenant_access_with_already_added_access(self):
+        def stub_add_flavor_access(flavorid, projectid, ctxt=None):
+            raise exception.FlavorAccessExists(flavor_id=flavorid,
+                                               project_id=projectid)
+        self.stubs.Set(flavors, 'add_flavor_access',
+                       stub_add_flavor_access)
+        body = {'addTenantAccess': {'tenant': 'proj2'}}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors/2/action',
+                                      use_admin_context=True)
+        self.assertRaises(exc.HTTPConflict,
+                          self.flavor_action_controller._addTenantAccess,
+                          self.req, '3', body)
+
+    def test_remove_tenant_access_with_bad_access(self):
+        def stub_remove_flavor_access(flavorid, projectid, ctxt=None):
+            raise exception.FlavorAccessNotFound(flavor_id=flavorid,
+                                                 project_id=projectid)
+        self.stubs.Set(flavors, 'remove_flavor_access',
+                       stub_remove_flavor_access)
+        body = {'removeTenantAccess': {'tenant': 'proj2'}}
+        req = fakes.HTTPRequest.blank('/v3/fake/flavors/2/action',
+                                      use_admin_context=True)
+        self.assertRaises(exc.HTTPNotFound,
+                          self.flavor_action_controller._removeTenantAccess,
+                          self.req, '3', body)
+
+
+class FlavorAccessSerializerTest(test.TestCase):
+    def test_serializer_empty(self):
+        serializer = flavor_access.FlavorAccessTemplate()
+        text = serializer.serialize(dict(flavor_access=[]))
+        tree = etree.fromstring(text)
+        self.assertEqual(len(tree), 0)
+
+    def test_serializer(self):
+        expected = ("<?xml version='1.0' encoding='UTF-8'?>\n"
+                    '<flavor_access>'
+                    '<access tenant_id="proj2" flavor_id="2"/>'
+                    '<access tenant_id="proj3" flavor_id="2"/>'
+                    '</flavor_access>')
+        access_list = [{'flavor_id': '2', 'tenant_id': 'proj2'},
+                       {'flavor_id': '2', 'tenant_id': 'proj3'}]
+
+        serializer = flavor_access.FlavorAccessTemplate()
+        text = serializer.serialize(dict(flavor_access=access_list))
+        self.assertEqual(text, expected)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
new file mode 100644
index 000000000..6680460de
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
@@ -0,0 +1,792 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2012 OpenStack Foundation
+# 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.
+
+from lxml import etree
+import webob
+
+import urlparse
+
+from nova.api.openstack.compute.plugins.v3 import flavors
+from nova.api.openstack import xmlutil
+import nova.compute.flavors
+from nova import context
+from nova import db
+from nova import exception
+from nova import test
+from nova.tests.api.openstack import fakes
+from nova.tests import matchers
+
+NS = "{http://docs.openstack.org/compute/api/v1.1}"
+ATOMNS = "{http://www.w3.org/2005/Atom}"
+
+
+FAKE_FLAVORS = {
+    'flavor 1': {
+        "flavorid": '1',
+        "name": 'flavor 1',
+        "memory_mb": '256',
+        "root_gb": '10',
+    },
+    'flavor 2': {
+        "flavorid": '2',
+        "name": 'flavor 2',
+        "memory_mb": '512',
+        "root_gb": '20',
+    },
+}
+
+
+def fake_flavor_get_by_flavor_id(flavorid):
+    return FAKE_FLAVORS['flavor %s' % flavorid]
+
+
+def fake_flavor_get_all(inactive=False, filters=None):
+    def reject_min(db_attr, filter_attr):
+        return (filter_attr in filters and
+                int(flavor[db_attr]) < int(filters[filter_attr]))
+
+    filters = filters or {}
+    output = {}
+    for (flavor_name, flavor) in FAKE_FLAVORS.items():
+        if reject_min('memory_mb', 'min_memory_mb'):
+            continue
+        elif reject_min('root_gb', 'min_root_gb'):
+            continue
+
+        output[flavor_name] = flavor
+
+    return output
+
+
+def empty_flavor_get_all(inactive=False, filters=None):
+    return {}
+
+
+def return_flavor_not_found(flavor_id):
+    raise exception.InstanceTypeNotFound(instance_type_id=flavor_id)
+
+
+class FlavorsTest(test.TestCase):
+    def setUp(self):
+        super(FlavorsTest, self).setUp()
+        self.flags(osapi_compute_extension=[])
+        fakes.stub_out_networking(self.stubs)
+        fakes.stub_out_rate_limiting(self.stubs)
+        self.stubs.Set(nova.compute.flavors, "get_all_flavors",
+                       fake_flavor_get_all)
+        self.stubs.Set(nova.compute.flavors,
+                       "get_flavor_by_flavor_id",
+                       fake_flavor_get_by_flavor_id)
+
+        self.controller = flavors.FlavorsController()
+
+    def test_get_flavor_by_invalid_id(self):
+        self.stubs.Set(nova.compute.flavors,
+                       "get_flavor_by_flavor_id",
+                       return_flavor_not_found)
+        req = fakes.HTTPRequestV3.blank('/flavors/asdf')
+        self.assertRaises(webob.exc.HTTPNotFound,
+                          self.controller.show, req, 'asdf')
+
+    def test_get_flavor_by_id(self):
+        req = fakes.HTTPRequestV3.blank('/flavors/1')
+        flavor = self.controller.show(req, '1')
+        expected = {
+            "flavor": {
+                "id": "1",
+                "name": "flavor 1",
+                "ram": "256",
+                "disk": "10",
+                "vcpus": "",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v3/flavors/1",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://localhost/flavors/1",
+                    },
+                ],
+            },
+        }
+        self.assertEqual(flavor, expected)
+
+    def test_get_flavor_with_custom_link_prefix(self):
+        self.flags(osapi_compute_link_prefix='http://zoo.com:42',
+                   osapi_glance_link_prefix='http://circus.com:34')
+        req = fakes.HTTPRequestV3.blank('/flavors/1')
+        flavor = self.controller.show(req, '1')
+        expected = {
+            "flavor": {
+                "id": "1",
+                "name": "flavor 1",
+                "ram": "256",
+                "disk": "10",
+                "vcpus": "",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://zoo.com:42/v3/flavors/1",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://zoo.com:42/flavors/1",
+                    },
+                ],
+            },
+        }
+        self.assertEqual(flavor, expected)
+
+    def test_get_flavor_list(self):
+        req = fakes.HTTPRequestV3.blank('/flavors')
+        flavor = self.controller.index(req)
+        expected = {
+            "flavors": [
+                {
+                    "id": "1",
+                    "name": "flavor 1",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/1",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/1",
+                        },
+                    ],
+                },
+                {
+                    "id": "2",
+                    "name": "flavor 2",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/2",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/2",
+                        },
+                    ],
+                },
+            ],
+        }
+        self.assertEqual(flavor, expected)
+
+    def test_get_flavor_list_with_marker(self):
+        self.maxDiff = None
+        req = fakes.HTTPRequestV3.blank('/flavors?limit=1&marker=1')
+        flavor = self.controller.index(req)
+        expected = {
+            "flavors": [
+                {
+                    "id": "2",
+                    "name": "flavor 2",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/2",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/2",
+                        },
+                    ],
+                },
+            ],
+            'flavors_links': [
+                {'href': 'http://localhost/v3/flavors?limit=1&marker=2',
+                 'rel': 'next'}
+            ]
+        }
+        self.assertThat(flavor, matchers.DictMatches(expected))
+
+    def test_get_flavor_detail_with_limit(self):
+        req = fakes.HTTPRequestV3.blank('/flavors/detail?limit=1')
+        response = self.controller.index(req)
+        response_list = response["flavors"]
+        response_links = response["flavors_links"]
+
+        expected_flavors = [
+            {
+                "id": "1",
+                "name": "flavor 1",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v3/flavors/1",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://localhost/flavors/1",
+                    },
+                ],
+            },
+        ]
+        self.assertEqual(response_list, expected_flavors)
+        self.assertEqual(response_links[0]['rel'], 'next')
+
+        href_parts = urlparse.urlparse(response_links[0]['href'])
+        self.assertEqual('/v3/flavors', href_parts.path)
+        params = urlparse.parse_qs(href_parts.query)
+        self.assertThat({'limit': ['1'], 'marker': ['1']},
+                        matchers.DictMatches(params))
+
+    def test_get_flavor_with_limit(self):
+        req = fakes.HTTPRequestV3.blank('/flavors?limit=2')
+        response = self.controller.index(req)
+        response_list = response["flavors"]
+        response_links = response["flavors_links"]
+
+        expected_flavors = [
+            {
+                "id": "1",
+                "name": "flavor 1",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v3/flavors/1",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://localhost/flavors/1",
+                    },
+                ],
+            },
+            {
+                "id": "2",
+                "name": "flavor 2",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v3/flavors/2",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://localhost/flavors/2",
+                    },
+                ],
+            }
+        ]
+        self.assertEqual(response_list, expected_flavors)
+        self.assertEqual(response_links[0]['rel'], 'next')
+
+        href_parts = urlparse.urlparse(response_links[0]['href'])
+        self.assertEqual('/v3/flavors', href_parts.path)
+        params = urlparse.parse_qs(href_parts.query)
+        self.assertThat({'limit': ['2'], 'marker': ['2']},
+                        matchers.DictMatches(params))
+
+    def test_get_flavor_list_detail(self):
+        req = fakes.HTTPRequestV3.blank('/flavors/detail')
+        flavor = self.controller.detail(req)
+        expected = {
+            "flavors": [
+                {
+                    "id": "1",
+                    "name": "flavor 1",
+                    "ram": "256",
+                    "disk": "10",
+                    "vcpus": "",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/1",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/1",
+                        },
+                    ],
+                },
+                {
+                    "id": "2",
+                    "name": "flavor 2",
+                    "ram": "512",
+                    "disk": "20",
+                    "vcpus": "",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/2",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/2",
+                        },
+                    ],
+                },
+            ],
+        }
+        self.assertEqual(flavor, expected)
+
+    def test_get_empty_flavor_list(self):
+        self.stubs.Set(nova.compute.flavors, "get_all_flavors",
+                       empty_flavor_get_all)
+
+        req = fakes.HTTPRequestV3.blank('/flavors')
+        flavors = self.controller.index(req)
+        expected = {'flavors': []}
+        self.assertEqual(flavors, expected)
+
+    def test_get_flavor_list_filter_min_ram(self):
+        # Flavor lists may be filtered by minRam.
+        req = fakes.HTTPRequestV3.blank('/flavors?minRam=512')
+        flavor = self.controller.index(req)
+        expected = {
+            "flavors": [
+                {
+                    "id": "2",
+                    "name": "flavor 2",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/2",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/2",
+                        },
+                    ],
+                },
+            ],
+        }
+        self.assertEqual(flavor, expected)
+
+    def test_get_flavor_list_filter_invalid_min_ram(self):
+        # Ensure you cannot list flavors with invalid minRam param.
+        req = fakes.HTTPRequestV3.blank('/flavors?minRam=NaN')
+        self.assertRaises(webob.exc.HTTPBadRequest,
+                          self.controller.index, req)
+
+    def test_get_flavor_list_filter_min_disk(self):
+        # Flavor lists may be filtered by minDisk.
+        req = fakes.HTTPRequestV3.blank('/flavors?minDisk=20')
+        flavor = self.controller.index(req)
+        expected = {
+            "flavors": [
+                {
+                    "id": "2",
+                    "name": "flavor 2",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/2",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/2",
+                        },
+                    ],
+                },
+            ],
+        }
+        self.assertEqual(flavor, expected)
+
+    def test_get_flavor_list_filter_invalid_min_disk(self):
+        # Ensure you cannot list flavors with invalid minDisk param.
+        req = fakes.HTTPRequestV3.blank('/flavors?minDisk=NaN')
+        self.assertRaises(webob.exc.HTTPBadRequest,
+                          self.controller.index, req)
+
+    def test_get_flavor_list_detail_min_ram_and_min_disk(self):
+        """Tests that filtering work on flavor details and that minRam and
+        minDisk filters can be combined
+        """
+        req = fakes.HTTPRequestV3.blank('/flavors/detail'
+                                        '?minRam=256&minDisk=20')
+        flavor = self.controller.detail(req)
+        expected = {
+            "flavors": [
+                {
+                    "id": "2",
+                    "name": "flavor 2",
+                    "ram": "512",
+                    "disk": "20",
+                    "vcpus": "",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/2",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/2",
+                        },
+                    ],
+                },
+            ],
+        }
+        self.assertEqual(flavor, expected)
+
+
+class FlavorsXMLSerializationTest(test.TestCase):
+
+    def test_xml_declaration(self):
+        serializer = flavors.FlavorTemplate()
+
+        fixture = {
+            "flavor": {
+                "id": "12",
+                "name": "asdf",
+                "ram": "256",
+                "disk": "10",
+                "vcpus": "",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v3/flavors/12",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://localhost/flavors/12",
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        has_dec = output.startswith("<?xml version='1.0' encoding='UTF-8'?>")
+        self.assertTrue(has_dec)
+
+    def test_show(self):
+        serializer = flavors.FlavorTemplate()
+
+        fixture = {
+            "flavor": {
+                "id": "12",
+                "name": "asdf",
+                "ram": "256",
+                "disk": "10",
+                "vcpus": "",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v3/flavors/12",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://localhost/flavors/12",
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'flavor')
+        flavor_dict = fixture['flavor']
+
+        for key in ['name', 'id', 'ram', 'disk']:
+            self.assertEqual(root.get(key), str(flavor_dict[key]))
+
+        link_nodes = root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(flavor_dict['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_show_handles_integers(self):
+        serializer = flavors.FlavorTemplate()
+
+        fixture = {
+            "flavor": {
+                "id": 12,
+                "name": "asdf",
+                "ram": 256,
+                "disk": 10,
+                "vcpus": "",
+                "links": [
+                    {
+                        "rel": "self",
+                        "href": "http://localhost/v3/flavors/12",
+                    },
+                    {
+                        "rel": "bookmark",
+                        "href": "http://localhost/flavors/12",
+                    },
+                ],
+            },
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'flavor')
+        flavor_dict = fixture['flavor']
+
+        for key in ['name', 'id', 'ram', 'disk']:
+            self.assertEqual(root.get(key), str(flavor_dict[key]))
+
+        link_nodes = root.findall('{0}link'.format(ATOMNS))
+        self.assertEqual(len(link_nodes), 2)
+        for i, link in enumerate(flavor_dict['links']):
+            for key, value in link.items():
+                self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_detail(self):
+        serializer = flavors.FlavorsTemplate()
+
+        fixture = {
+            "flavors": [
+                {
+                    "id": "23",
+                    "name": "flavor 23",
+                    "ram": "512",
+                    "disk": "20",
+                    "vcpus": "",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/23",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/23",
+                        },
+                    ],
+                },
+                {
+                    "id": "13",
+                    "name": "flavor 13",
+                    "ram": "256",
+                    "disk": "10",
+                    "vcpus": "",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/13",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/13",
+                        },
+                    ],
+                },
+            ],
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'flavors')
+        flavor_elems = root.findall('{0}flavor'.format(NS))
+        self.assertEqual(len(flavor_elems), 2)
+        for i, flavor_elem in enumerate(flavor_elems):
+            flavor_dict = fixture['flavors'][i]
+
+            for key in ['name', 'id', 'ram', 'disk']:
+                self.assertEqual(flavor_elem.get(key), str(flavor_dict[key]))
+
+            link_nodes = flavor_elem.findall('{0}link'.format(ATOMNS))
+            self.assertEqual(len(link_nodes), 2)
+            for i, link in enumerate(flavor_dict['links']):
+                for key, value in link.items():
+                    self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_index(self):
+        serializer = flavors.MinimalFlavorsTemplate()
+
+        fixture = {
+            "flavors": [
+                {
+                    "id": "23",
+                    "name": "flavor 23",
+                    "ram": "512",
+                    "disk": "20",
+                    "vcpus": "",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/23",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/23",
+                        },
+                    ],
+                },
+                {
+                    "id": "13",
+                    "name": "flavor 13",
+                    "ram": "256",
+                    "disk": "10",
+                    "vcpus": "",
+                    "links": [
+                        {
+                            "rel": "self",
+                            "href": "http://localhost/v3/flavors/13",
+                        },
+                        {
+                            "rel": "bookmark",
+                            "href": "http://localhost/flavors/13",
+                        },
+                    ],
+                },
+            ],
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'flavors_index')
+        flavor_elems = root.findall('{0}flavor'.format(NS))
+        self.assertEqual(len(flavor_elems), 2)
+        for i, flavor_elem in enumerate(flavor_elems):
+            flavor_dict = fixture['flavors'][i]
+
+            for key in ['name', 'id']:
+                self.assertEqual(flavor_elem.get(key), str(flavor_dict[key]))
+
+            link_nodes = flavor_elem.findall('{0}link'.format(ATOMNS))
+            self.assertEqual(len(link_nodes), 2)
+            for i, link in enumerate(flavor_dict['links']):
+                for key, value in link.items():
+                    self.assertEqual(link_nodes[i].get(key), value)
+
+    def test_index_empty(self):
+        serializer = flavors.MinimalFlavorsTemplate()
+
+        fixture = {
+            "flavors": [],
+        }
+
+        output = serializer.serialize(fixture)
+        root = etree.XML(output)
+        xmlutil.validate_schema(root, 'flavors_index')
+        flavor_elems = root.findall('{0}flavor'.format(NS))
+        self.assertEqual(len(flavor_elems), 0)
+
+
+class DisabledFlavorsWithRealDBTest(test.TestCase):
+    """
+    Tests that disabled flavors should not be shown nor listed.
+    """
+    def setUp(self):
+        super(DisabledFlavorsWithRealDBTest, self).setUp()
+        self.controller = flavors.FlavorsController()
+
+        # Add a new disabled type to the list of flavors
+        self.req = fakes.HTTPRequestV3.blank('/flavors')
+        self.context = self.req.environ['nova.context']
+        self.admin_context = context.get_admin_context()
+
+        self.disabled_type = self._create_disabled_instance_type()
+        self.inst_types = db.api.instance_type_get_all(self.admin_context)
+
+    def tearDown(self):
+        db.api.instance_type_destroy(self.admin_context,
+                                     self.disabled_type['name'])
+
+        super(DisabledFlavorsWithRealDBTest, self).tearDown()
+
+    def _create_disabled_instance_type(self):
+        inst_types = db.api.instance_type_get_all(self.admin_context)
+
+        inst_type = inst_types[0]
+
+        del inst_type['id']
+        inst_type['name'] += '.disabled'
+        inst_type['flavorid'] = unicode(max(
+                [int(flavor['flavorid']) for flavor in inst_types]) + 1)
+        inst_type['disabled'] = True
+
+        disabled_type = db.api.instance_type_create(self.admin_context,
+                                                    inst_type)
+
+        return disabled_type
+
+    def test_index_should_not_list_disabled_flavors_to_user(self):
+        self.context.is_admin = False
+
+        flavor_list = self.controller.index(self.req)['flavors']
+        api_flavorids = set(f['id'] for f in flavor_list)
+
+        db_flavorids = set(i['flavorid'] for i in self.inst_types)
+        disabled_flavorid = str(self.disabled_type['flavorid'])
+
+        self.assert_(disabled_flavorid in db_flavorids)
+        self.assertEqual(db_flavorids - set([disabled_flavorid]),
+                         api_flavorids)
+
+    def test_index_should_list_disabled_flavors_to_admin(self):
+        self.context.is_admin = True
+
+        flavor_list = self.controller.index(self.req)['flavors']
+        api_flavorids = set(f['id'] for f in flavor_list)
+
+        db_flavorids = set(i['flavorid'] for i in self.inst_types)
+        disabled_flavorid = str(self.disabled_type['flavorid'])
+
+        self.assert_(disabled_flavorid in db_flavorids)
+        self.assertEqual(db_flavorids, api_flavorids)
+
+    def test_show_should_include_disabled_flavor_for_user(self):
+        """
+        Counterintuitively we should show disabled flavors to all users and not
+        just admins. The reason is that, when a user performs a server-show
+        request, we want to be able to display the pretty flavor name ('512 MB
+        Instance') and not just the flavor-id even if the flavor id has been
+        marked disabled.
+        """
+        self.context.is_admin = False
+
+        flavor = self.controller.show(
+                self.req, self.disabled_type['flavorid'])['flavor']
+
+        self.assertEqual(flavor['name'], self.disabled_type['name'])
+
+    def test_show_should_include_disabled_flavor_for_admin(self):
+        self.context.is_admin = True
+
+        flavor = self.controller.show(
+                self.req, self.disabled_type['flavorid'])['flavor']
+
+        self.assertEqual(flavor['name'], self.disabled_type['name'])
+
+
+class ParseIsPublicTest(test.TestCase):
+    def setUp(self):
+        super(ParseIsPublicTest, self).setUp()
+        self.controller = flavors.FlavorsController()
+
+    def assertPublic(self, expected, is_public):
+        self.assertIs(expected, self.controller._parse_is_public(is_public),
+                      '%s did not return %s' % (is_public, expected))
+
+    def test_None(self):
+        self.assertPublic(True, None)
+
+    def test_truthy(self):
+        self.assertPublic(True, True)
+        self.assertPublic(True, 't')
+        self.assertPublic(True, 'true')
+        self.assertPublic(True, 'yes')
+        self.assertPublic(True, '1')
+
+    def test_falsey(self):
+        self.assertPublic(False, False)
+        self.assertPublic(False, 'f')
+        self.assertPublic(False, 'false')
+        self.assertPublic(False, 'no')
+        self.assertPublic(False, '0')
+
+    def test_string_none(self):
+        self.assertPublic(None, 'none')
+
+    def test_other(self):
+        self.assertRaises(
+                webob.exc.HTTPBadRequest, self.assertPublic, None, 'other')
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_quota_classes.py b/nova/tests/api/openstack/compute/plugins/v3/test_quota_classes.py
new file mode 100644
index 000000000..c4f79118e
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_quota_classes.py
@@ -0,0 +1,188 @@
+# Copyright 2012 OpenStack Foundation
+# 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.
+
+from lxml import etree
+import webob
+
+from nova.api.openstack.compute.contrib import quota_classes
+from nova.api.openstack import wsgi
+from nova import test
+from nova.tests.api.openstack import fakes
+
+
+def quota_set(class_name):
+    return {'quota_class_set': {'id': class_name, 'metadata_items': 128,
+                                'ram': 51200, 'floating_ips': 10,
+                                'fixed_ips': -1, 'instances': 10,
+                                'injected_files': 5, 'cores': 20,
+                                'injected_file_content_bytes': 10240,
+                                'security_groups': 10,
+                                'security_group_rules': 20, 'key_pairs': 100,
+                                'injected_file_path_bytes': 255}}
+
+
+class QuotaClassSetsTest(test.TestCase):
+
+    def setUp(self):
+        super(QuotaClassSetsTest, self).setUp()
+        self.controller = quota_classes.QuotaClassSetsController()
+
+    def test_format_quota_set(self):
+        raw_quota_set = {
+            'instances': 10,
+            'cores': 20,
+            'ram': 51200,
+            'floating_ips': 10,
+            'fixed_ips': -1,
+            'metadata_items': 128,
+            'injected_files': 5,
+            'injected_file_path_bytes': 255,
+            'injected_file_content_bytes': 10240,
+            'security_groups': 10,
+            'security_group_rules': 20,
+            'key_pairs': 100,
+            }
+
+        quota_set = self.controller._format_quota_set('test_class',
+                                                      raw_quota_set)
+        qs = quota_set['quota_class_set']
+
+        self.assertEqual(qs['id'], 'test_class')
+        self.assertEqual(qs['instances'], 10)
+        self.assertEqual(qs['cores'], 20)
+        self.assertEqual(qs['ram'], 51200)
+        self.assertEqual(qs['floating_ips'], 10)
+        self.assertEqual(qs['fixed_ips'], -1)
+        self.assertEqual(qs['metadata_items'], 128)
+        self.assertEqual(qs['injected_files'], 5)
+        self.assertEqual(qs['injected_file_path_bytes'], 255)
+        self.assertEqual(qs['injected_file_content_bytes'], 10240)
+        self.assertEqual(qs['security_groups'], 10)
+        self.assertEqual(qs['security_group_rules'], 20)
+        self.assertEqual(qs['key_pairs'], 100)
+
+    def test_quotas_show_as_admin(self):
+        req = fakes.HTTPRequest.blank(
+            '/v2/fake4/os-quota-class-sets/test_class',
+            use_admin_context=True)
+        res_dict = self.controller.show(req, 'test_class')
+
+        self.assertEqual(res_dict, quota_set('test_class'))
+
+    def test_quotas_show_as_unauthorized_user(self):
+        req = fakes.HTTPRequest.blank(
+            '/v2/fake4/os-quota-class-sets/test_class')
+        self.assertRaises(webob.exc.HTTPForbidden, self.controller.show,
+                          req, 'test_class')
+
+    def test_quotas_update_as_admin(self):
+        body = {'quota_class_set': {'instances': 50, 'cores': 50,
+                                    'ram': 51200, 'floating_ips': 10,
+                                    'fixed_ips': -1, 'metadata_items': 128,
+                                    'injected_files': 5,
+                                    'injected_file_content_bytes': 10240,
+                                    'injected_file_path_bytes': 255,
+                                    'security_groups': 10,
+                                    'security_group_rules': 20,
+                                    'key_pairs': 100}}
+
+        req = fakes.HTTPRequest.blank(
+            '/v2/fake4/os-quota-class-sets/test_class',
+            use_admin_context=True)
+        res_dict = self.controller.update(req, 'test_class', body)
+
+        self.assertEqual(res_dict, body)
+
+    def test_quotas_update_as_user(self):
+        body = {'quota_class_set': {'instances': 50, 'cores': 50,
+                                    'ram': 51200, 'floating_ips': 10,
+                                    'fixed_ips': -1, 'metadata_items': 128,
+                                    'injected_files': 5,
+                                    'injected_file_content_bytes': 10240,
+                                    'security_groups': 10,
+                                    'security_group_rules': 20,
+                                    'key_pairs': 100,
+                                    }}
+
+        req = fakes.HTTPRequest.blank(
+            '/v2/fake4/os-quota-class-sets/test_class')
+        self.assertRaises(webob.exc.HTTPForbidden, self.controller.update,
+                          req, 'test_class', body)
+
+
+class QuotaTemplateXMLSerializerTest(test.TestCase):
+    def setUp(self):
+        super(QuotaTemplateXMLSerializerTest, self).setUp()
+        self.serializer = quota_classes.QuotaClassTemplate()
+        self.deserializer = wsgi.XMLDeserializer()
+
+    def test_serializer(self):
+        exemplar = dict(quota_class_set=dict(
+                id='test_class',
+                metadata_items=10,
+                injected_file_path_bytes=255,
+                injected_file_content_bytes=20,
+                ram=50,
+                floating_ips=60,
+                fixed_ips=-1,
+                instances=70,
+                injected_files=80,
+                security_groups=10,
+                security_group_rules=20,
+                key_pairs=100,
+                cores=90))
+        text = self.serializer.serialize(exemplar)
+
+        tree = etree.fromstring(text)
+
+        self.assertEqual('quota_class_set', tree.tag)
+        self.assertEqual('test_class', tree.get('id'))
+        self.assertEqual(len(exemplar['quota_class_set']) - 1, len(tree))
+        for child in tree:
+            self.assertTrue(child.tag in exemplar['quota_class_set'])
+            self.assertEqual(int(child.text),
+                             exemplar['quota_class_set'][child.tag])
+
+    def test_deserializer(self):
+        exemplar = dict(quota_class_set=dict(
+                metadata_items='10',
+                injected_file_content_bytes='20',
+                ram='50',
+                floating_ips='60',
+                fixed_ips='-1',
+                instances='70',
+                injected_files='80',
+                security_groups='10',
+                security_group_rules='20',
+                key_pairs='100',
+                cores='90'))
+        intext = ("<?xml version='1.0' encoding='UTF-8'?>\n"
+                  '<quota_class_set>'
+                  '<metadata_items>10</metadata_items>'
+                  '<injected_file_content_bytes>20'
+                  '</injected_file_content_bytes>'
+                  '<ram>50</ram>'
+                  '<floating_ips>60</floating_ips>'
+                  '<fixed_ips>-1</fixed_ips>'
+                  '<instances>70</instances>'
+                  '<injected_files>80</injected_files>'
+                  '<cores>90</cores>'
+                  '<security_groups>10</security_groups>'
+                  '<security_group_rules>20</security_group_rules>'
+                  '<key_pairs>100</key_pairs>'
+                  '</quota_class_set>')
+
+        result = self.deserializer.deserialize(intext)['body']
+        self.assertEqual(result, exemplar)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py b/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py
new file mode 100644
index 000000000..6eea01cff
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_quota_sets.py
@@ -0,0 +1,399 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+# Copyright 2011 OpenStack Foundation
+# Copyright 2013 IBM Corp.
+# 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.
+
+from lxml import etree
+import webob
+
+from nova.api.openstack.compute.plugins.v3 import quota_sets as quotas
+from nova.api.openstack import extensions
+from nova.api.openstack import wsgi
+from nova import context as context_maker
+from nova import quota
+from nova import test
+from nova.tests.api.openstack import fakes
+
+
+def quota_set(id):
+    return {'quota_set': {'id': id, 'metadata_items': 128,
+            'ram': 51200, 'floating_ips': 10, 'fixed_ips': -1,
+            'instances': 10, 'injected_files': 5, 'cores': 20,
+            'injected_file_content_bytes': 10240,
+            'security_groups': 10, 'security_group_rules': 20,
+            'key_pairs': 100, 'injected_file_path_bytes': 255}}
+
+
+class QuotaSetsTest(test.TestCase):
+
+    def setUp(self):
+        super(QuotaSetsTest, self).setUp()
+        self.ext_mgr = self.mox.CreateMock(extensions.ExtensionManager)
+        self.controller = quotas.QuotaSetsController(self.ext_mgr)
+
+    def test_format_quota_set(self):
+        raw_quota_set = {
+            'instances': 10,
+            'cores': 20,
+            'ram': 51200,
+            'floating_ips': 10,
+            'fixed_ips': -1,
+            'metadata_items': 128,
+            'injected_files': 5,
+            'injected_file_path_bytes': 255,
+            'injected_file_content_bytes': 10240,
+            'security_groups': 10,
+            'security_group_rules': 20,
+            'key_pairs': 100}
+
+        quota_set = self.controller._format_quota_set('1234', raw_quota_set)
+        qs = quota_set['quota_set']
+
+        self.assertEqual(qs['id'], '1234')
+        self.assertEqual(qs['instances'], 10)
+        self.assertEqual(qs['cores'], 20)
+        self.assertEqual(qs['ram'], 51200)
+        self.assertEqual(qs['floating_ips'], 10)
+        self.assertEqual(qs['fixed_ips'], -1)
+        self.assertEqual(qs['metadata_items'], 128)
+        self.assertEqual(qs['injected_files'], 5)
+        self.assertEqual(qs['injected_file_path_bytes'], 255)
+        self.assertEqual(qs['injected_file_content_bytes'], 10240)
+        self.assertEqual(qs['security_groups'], 10)
+        self.assertEqual(qs['security_group_rules'], 20)
+        self.assertEqual(qs['key_pairs'], 100)
+
+    def test_quotas_defaults(self):
+        uri = '/os-quota-sets/fake_tenant/defaults'
+
+        req = fakes.HTTPRequestV3.blank(uri)
+        res_dict = self.controller.defaults(req, 'fake_tenant')
+
+        expected = {'quota_set': {
+                    'id': 'fake_tenant',
+                    'instances': 10,
+                    'cores': 20,
+                    'ram': 51200,
+                    'floating_ips': 10,
+                    'fixed_ips': -1,
+                    'metadata_items': 128,
+                    'injected_files': 5,
+                    'injected_file_path_bytes': 255,
+                    'injected_file_content_bytes': 10240,
+                    'security_groups': 10,
+                    'security_group_rules': 20,
+                    'key_pairs': 100}}
+
+        self.assertEqual(res_dict, expected)
+
+    def test_quotas_show_as_admin(self):
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/1234',
+                                      use_admin_context=True)
+        res_dict = self.controller.show(req, 1234)
+
+        self.assertEqual(res_dict, quota_set('1234'))
+
+    def test_quotas_show_as_unauthorized_user(self):
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/1234')
+        self.assertRaises(webob.exc.HTTPForbidden, self.controller.show,
+                          req, 1234)
+
+    def test_quotas_update_as_admin(self):
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        body = {'quota_set': {'instances': 50, 'cores': 50,
+                              'ram': 51200, 'floating_ips': 10,
+                              'fixed_ips': -1, 'metadata_items': 128,
+                              'injected_files': 5,
+                              'injected_file_content_bytes': 10240,
+                              'injected_file_path_bytes': 255,
+                              'security_groups': 10,
+                              'security_group_rules': 20,
+                              'key_pairs': 100, 'fixed_ips': -1}}
+
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        res_dict = self.controller.update(req, 'update_me', body)
+
+        self.assertEqual(res_dict, body)
+
+    def test_quotas_update_as_user(self):
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        body = {'quota_set': {'instances': 50, 'cores': 50,
+                              'ram': 51200, 'floating_ips': 10,
+                              'fixed_ips': -1, 'metadata_items': 128,
+                              'injected_files': 5,
+                              'injected_file_content_bytes': 10240,
+                              'security_groups': 10,
+                              'security_group_rules': 20,
+                              'key_pairs': 100}}
+
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me')
+        self.assertRaises(webob.exc.HTTPForbidden, self.controller.update,
+                          req, 'update_me', body)
+
+    def test_quotas_update_invalid_key(self):
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        body = {'quota_set': {'instances2': -2, 'cores': -2,
+                              'ram': -2, 'floating_ips': -2,
+                              'metadata_items': -2, 'injected_files': -2,
+                              'injected_file_content_bytes': -2}}
+
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+                          req, 'update_me', body)
+
+    def test_quotas_update_invalid_limit(self):
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        body = {'quota_set': {'instances': -2, 'cores': -2,
+                              'ram': -2, 'floating_ips': -2, 'fixed_ips': -2,
+                              'metadata_items': -2, 'injected_files': -2,
+                              'injected_file_content_bytes': -2}}
+
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+                          req, 'update_me', body)
+
+    def test_quotas_update_invalid_value_json_fromat_empty_string(self):
+        expected_resp = {'quota_set': {
+                              'instances': 50, 'cores': 50,
+                              'ram': 51200, 'floating_ips': 10,
+                              'fixed_ips': -1, 'metadata_items': 128,
+                              'injected_files': 5,
+                              'injected_file_content_bytes': 10240,
+                              'injected_file_path_bytes': 255,
+                              'security_groups': 10,
+                              'security_group_rules': 20,
+                              'key_pairs': 100}}
+
+        # when PUT JSON format with empty string for quota
+        body = {'quota_set': {'instances': 50, 'cores': 50,
+                              'ram': '', 'floating_ips': 10,
+                              'fixed_ips': -1, 'metadata_items': 128,
+                              'injected_files': 5,
+                              'injected_file_content_bytes': 10240,
+                              'injected_file_path_bytes': 255,
+                              'security_groups': 10,
+                              'security_group_rules': 20,
+                              'key_pairs': 100}}
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        res_dict = self.controller.update(req, 'update_me', body)
+        self.assertEqual(res_dict, expected_resp)
+
+    def test_quotas_update_invalid_value_xml_fromat_empty_string(self):
+        expected_resp = {'quota_set': {
+                              'instances': 50, 'cores': 50,
+                              'ram': 51200, 'floating_ips': 10,
+                              'fixed_ips': -1, 'metadata_items': 128,
+                              'injected_files': 5,
+                              'injected_file_content_bytes': 10240,
+                              'injected_file_path_bytes': 255,
+                              'security_groups': 10,
+                              'security_group_rules': 20,
+                              'key_pairs': 100}}
+        # when PUT XML format with empty string for quota
+        body = {'quota_set': {'instances': 50, 'cores': 50,
+                              'ram': {}, 'floating_ips': 10,
+                              'fixed_ips': -1, 'metadata_items': 128,
+                              'injected_files': 5,
+                              'injected_file_content_bytes': 10240,
+                              'injected_file_path_bytes': 255,
+                              'security_groups': 10,
+                              'security_group_rules': 20,
+                              'key_pairs': 100}}
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        res_dict = self.controller.update(req, 'update_me', body)
+        self.assertEqual(res_dict, expected_resp)
+
+    def test_quotas_update_invalid_value_non_int(self):
+        # when PUT non integer value
+        body = {'quota_set': {'instances': test, 'cores': 50,
+                              'ram': {}, 'floating_ips': 10,
+                              'fixed_ips': -1, 'metadata_items': 128,
+                              'injected_files': 5,
+                              'injected_file_content_bytes': 10240,
+                              'injected_file_path_bytes': 255,
+                              'security_groups': 10,
+                              'security_group_rules': 20,
+                              'key_pairs': 100}}
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+                          req, 'update_me', body)
+
+    def test_delete_quotas_when_extension_not_loaded(self):
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(False)
+        self.mox.ReplayAll()
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/1234')
+        self.assertRaises(webob.exc.HTTPNotFound, self.controller.delete,
+                          req, 1234)
+
+    def test_quotas_delete_as_unauthorized_user(self):
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/1234')
+        self.assertRaises(webob.exc.HTTPForbidden, self.controller.delete,
+                          req, 1234)
+
+    def test_quotas_delete_as_admin(self):
+        context = context_maker.get_admin_context()
+        self.req = fakes.HTTPRequestV3.blank('/os-quota-sets/1234')
+        self.req.environ['nova.context'] = context
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.StubOutWithMock(quota.QUOTAS,
+                                 "destroy_all_by_project")
+        quota.QUOTAS.destroy_all_by_project(context, 1234)
+        self.mox.ReplayAll()
+        res = self.controller.delete(self.req, 1234)
+        self.mox.VerifyAll()
+        self.assertEqual(res.status_int, 202)
+
+
+class QuotaXMLSerializerTest(test.TestCase):
+    def setUp(self):
+        super(QuotaXMLSerializerTest, self).setUp()
+        self.serializer = quotas.QuotaTemplate()
+        self.deserializer = wsgi.XMLDeserializer()
+
+    def test_serializer(self):
+        exemplar = dict(quota_set=dict(
+                id='project_id',
+                metadata_items=10,
+                injected_file_path_bytes=255,
+                injected_file_content_bytes=20,
+                ram=50,
+                floating_ips=60,
+                fixed_ips=-1,
+                instances=70,
+                injected_files=80,
+                security_groups=10,
+                security_group_rules=20,
+                key_pairs=100,
+                cores=90))
+        text = self.serializer.serialize(exemplar)
+
+        tree = etree.fromstring(text)
+
+        self.assertEqual('quota_set', tree.tag)
+        self.assertEqual('project_id', tree.get('id'))
+        self.assertEqual(len(exemplar['quota_set']) - 1, len(tree))
+        for child in tree:
+            self.assertTrue(child.tag in exemplar['quota_set'])
+            self.assertEqual(int(child.text), exemplar['quota_set'][child.tag])
+
+    def test_deserializer(self):
+        exemplar = dict(quota_set=dict(
+                metadata_items='10',
+                injected_file_content_bytes='20',
+                ram='50',
+                floating_ips='60',
+                fixed_ips='-1',
+                instances='70',
+                injected_files='80',
+                security_groups='10',
+                security_group_rules='20',
+                key_pairs='100',
+                cores='90'))
+        intext = ("<?xml version='1.0' encoding='UTF-8'?>\n"
+                  '<quota_set>'
+                  '<metadata_items>10</metadata_items>'
+                  '<injected_file_content_bytes>20'
+                  '</injected_file_content_bytes>'
+                  '<ram>50</ram>'
+                  '<floating_ips>60</floating_ips>'
+                  '<fixed_ips>-1</fixed_ips>'
+                  '<instances>70</instances>'
+                  '<injected_files>80</injected_files>'
+                  '<security_groups>10</security_groups>'
+                  '<security_group_rules>20</security_group_rules>'
+                  '<key_pairs>100</key_pairs>'
+                  '<cores>90</cores>'
+                  '</quota_set>')
+
+        result = self.deserializer.deserialize(intext)['body']
+        self.assertEqual(result, exemplar)
+
+
+fake_quotas = {'ram': {'limit': 51200,
+                       'in_use': 12800,
+                       'reserved': 12800},
+               'cores': {'limit': 20,
+                         'in_use': 10,
+                         'reserved': 5},
+               'instances': {'limit': 100,
+                             'in_use': 0,
+                             'reserved': 0}}
+
+
+def fake_get_quotas(self, context, id, usages=False):
+    if usages:
+        return fake_quotas
+    else:
+        return dict((k, v['limit']) for k, v in fake_quotas.items())
+
+
+class ExtendedQuotasTest(test.TestCase):
+
+    def setUp(self):
+        super(ExtendedQuotasTest, self).setUp()
+        self.ext_mgr = self.mox.CreateMock(extensions.ExtensionManager)
+        self.controller = quotas.QuotaSetsController(self.ext_mgr)
+
+    def test_quotas_update_exceed_in_used(self):
+
+        body = {'quota_set': {'cores': 10}}
+
+        self.stubs.Set(quotas.QuotaSetsController, '_get_quotas',
+                       fake_get_quotas)
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+
+        self.assertRaises(webob.exc.HTTPBadRequest, self.controller.update,
+                          req, 'update_me', body)
+
+    def test_quotas_force_update_exceed_in_used(self):
+        self.stubs.Set(quotas.QuotaSetsController, '_get_quotas',
+                       fake_get_quotas)
+        req = fakes.HTTPRequestV3.blank('/os-quota-sets/update_me',
+                                      use_admin_context=True)
+        expected = {'quota_set': {'ram': 25600, 'instances': 200, 'cores': 10}}
+        body = {'quota_set': {'ram': 25600,
+                              'instances': 200,
+                              'cores': 10,
+                              'force': 'True'}}
+        fake_quotas.get('ram')['limit'] = 25600
+        fake_quotas.get('cores')['limit'] = 10
+        fake_quotas.get('instances')['limit'] = 200
+
+        self.ext_mgr.is_loaded('os-extended-quotas').AndReturn(True)
+        self.mox.ReplayAll()
+        res_dict = self.controller.update(req, 'update_me', body)
+        self.assertEqual(res_dict, expected)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_rescue.py b/nova/tests/api/openstack/compute/plugins/v3/test_rescue.py
new file mode 100644
index 000000000..75733e50f
--- /dev/null
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_rescue.py
@@ -0,0 +1,126 @@
+#   Copyright 2011 OpenStack Foundation
+#
+#   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.
+
+from oslo.config import cfg
+import webob
+
+from nova import compute
+from nova import exception
+from nova.openstack.common import jsonutils
+from nova import test
+from nova.tests.api.openstack import fakes
+
+CONF = cfg.CONF
+CONF.import_opt('password_length', 'nova.utils')
+
+
+def rescue(self, context, instance, rescue_password=None):
+    pass
+
+
+def unrescue(self, context, instance):
+    pass
+
+
+class RescueTest(test.TestCase):
+    def setUp(self):
+        super(RescueTest, self).setUp()
+
+        def fake_compute_get(*args, **kwargs):
+            uuid = '70f6db34-de8d-4fbd-aafb-4065bdfa6114'
+            return {'id': 1, 'uuid': uuid}
+
+        self.stubs.Set(compute.api.API, "get", fake_compute_get)
+        self.stubs.Set(compute.api.API, "rescue", rescue)
+        self.stubs.Set(compute.api.API, "unrescue", unrescue)
+        self.app = fakes.wsgi_app_v3(init_only=('servers', 'os-rescue'))
+
+    def test_rescue_with_preset_password(self):
+        body = {"rescue": {"adminPass": "AABBCC112233"}}
+        req = webob.Request.blank('/v3/servers/test_inst/action')
+        req.method = "POST"
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+
+        resp = req.get_response(self.app)
+        self.assertEqual(resp.status_int, 200)
+        resp_json = jsonutils.loads(resp.body)
+        self.assertEqual("AABBCC112233", resp_json['adminPass'])
+
+    def test_rescue_generates_password(self):
+        body = dict(rescue=None)
+        req = webob.Request.blank('/v3/servers/test_inst/action')
+        req.method = "POST"
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+
+        resp = req.get_response(self.app)
+        self.assertEqual(resp.status_int, 200)
+        resp_json = jsonutils.loads(resp.body)
+        self.assertEqual(CONF.password_length, len(resp_json['adminPass']))
+
+    def test_rescue_of_rescued_instance(self):
+        body = dict(rescue=None)
+
+        def fake_rescue(*args, **kwargs):
+            raise exception.InstanceInvalidState('fake message')
+
+        self.stubs.Set(compute.api.API, "rescue", fake_rescue)
+        req = webob.Request.blank('/v3/servers/test_inst/action')
+        req.method = "POST"
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+
+        resp = req.get_response(self.app)
+        self.assertEqual(resp.status_int, 409)
+
+    def test_unrescue(self):
+        body = dict(unrescue=None)
+        req = webob.Request.blank('/v3/servers/test_inst/action')
+        req.method = "POST"
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+
+        resp = req.get_response(self.app)
+        self.assertEqual(resp.status_int, 202)
+
+    def test_unrescue_of_active_instance(self):
+        body = dict(unrescue=None)
+
+        def fake_unrescue(*args, **kwargs):
+            raise exception.InstanceInvalidState('fake message')
+
+        self.stubs.Set(compute.api.API, "unrescue", fake_unrescue)
+        req = webob.Request.blank('/v3/servers/test_inst/action')
+        req.method = "POST"
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+
+        resp = req.get_response(self.app)
+        self.assertEqual(resp.status_int, 409)
+
+    def test_rescue_raises_unrescuable(self):
+        body = dict(rescue=None)
+
+        def fake_rescue(*args, **kwargs):
+            raise exception.InstanceNotRescuable('fake message')
+
+        self.stubs.Set(compute.api.API, "rescue", fake_rescue)
+        req = webob.Request.blank('/v3/servers/test_inst/action')
+        req.method = "POST"
+        req.body = jsonutils.dumps(body)
+        req.headers["content-type"] = "application/json"
+
+        resp = req.get_response(self.app)
+        self.assertEqual(resp.status_int, 400)
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
index da17d8fd5..4505a1750 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_servers.py
@@ -228,7 +228,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEquals(res, [(None, None, port)])
 
     def test_get_server_by_uuid(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         res_dict = self.controller.show(req, FAKE_UUID)
         self.assertEqual(res_dict['server']['id'], FAKE_UUID)
 
@@ -246,7 +246,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get',
                        return_instance_with_host)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         server1 = self.controller.show(req, FAKE_UUID)
         server2 = self.controller.show(req, FAKE_UUID)
 
@@ -255,11 +255,11 @@ class ServersControllerTest(test.TestCase):
 
     def test_get_server_by_id(self):
         self.flags(use_ipv6=True)
-        image_bookmark = "http://localhost/fake/images/10"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
+        image_bookmark = "http://localhost/images/10"
+        flavor_bookmark = "http://localhost/flavors/1"
 
         uuid = FAKE_UUID
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % uuid)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % uuid)
         res_dict = self.controller.show(req, uuid)
 
         expected_server = {
@@ -305,11 +305,11 @@ class ServersControllerTest(test.TestCase):
                 "links": [
                     {
                         "rel": "self",
-                        "href": "http://localhost/v3/fake/servers/%s" % uuid,
+                        "href": "http://localhost/v3/servers/%s" % uuid,
                     },
                     {
                         "rel": "bookmark",
-                        "href": "http://localhost/fake/servers/%s" % uuid,
+                        "href": "http://localhost/servers/%s" % uuid,
                     },
                 ],
             }
@@ -318,15 +318,15 @@ class ServersControllerTest(test.TestCase):
         self.assertThat(res_dict, matchers.DictMatches(expected_server))
 
     def test_get_server_with_active_status_by_id(self):
-        image_bookmark = "http://localhost/fake/images/10"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
+        image_bookmark = "http://localhost/images/10"
+        flavor_bookmark = "http://localhost/flavors/1"
 
         new_return_server = fakes.fake_instance_get(
                 vm_state=vm_states.ACTIVE, progress=100)
         self.stubs.Set(db, 'instance_get_by_uuid', new_return_server)
 
         uuid = FAKE_UUID
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % uuid)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % uuid)
         res_dict = self.controller.show(req, uuid)
         expected_server = {
             "server": {
@@ -371,11 +371,11 @@ class ServersControllerTest(test.TestCase):
                 "links": [
                     {
                         "rel": "self",
-                        "href": "http://localhost/v3/fake/servers/%s" % uuid,
+                        "href": "http://localhost/v3/servers/%s" % uuid,
                     },
                     {
                         "rel": "bookmark",
-                        "href": "http://localhost/fake/servers/%s" % uuid,
+                        "href": "http://localhost/servers/%s" % uuid,
                     },
                 ],
             }
@@ -385,9 +385,9 @@ class ServersControllerTest(test.TestCase):
 
     def test_get_server_with_id_image_ref_by_id(self):
         image_ref = "10"
-        image_bookmark = "http://localhost/fake/images/10"
+        image_bookmark = "http://localhost/images/10"
         flavor_id = "1"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
+        flavor_bookmark = "http://localhost/flavors/1"
 
         new_return_server = fakes.fake_instance_get(
                 vm_state=vm_states.ACTIVE, image_ref=image_ref,
@@ -395,7 +395,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid', new_return_server)
 
         uuid = FAKE_UUID
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % uuid)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % uuid)
         res_dict = self.controller.show(req, uuid)
         expected_server = {
             "server": {
@@ -440,11 +440,11 @@ class ServersControllerTest(test.TestCase):
                 "links": [
                     {
                         "rel": "self",
-                        "href": "http://localhost/v3/fake/servers/%s" % uuid,
+                        "href": "http://localhost/v3/servers/%s" % uuid,
                     },
                     {
                         "rel": "bookmark",
-                        "href": "http://localhost/fake/servers/%s" % uuid,
+                        "href": "http://localhost/servers/%s" % uuid,
                     },
                 ],
             }
@@ -484,7 +484,7 @@ class ServersControllerTest(test.TestCase):
         return_server = fakes.fake_instance_get(nw_cache=nw_cache)
         self.stubs.Set(db, 'instance_get_by_uuid', return_server)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s/ips' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s/ips' % FAKE_UUID)
         res_dict = self.ips_controller.index(req, FAKE_UUID)
 
         expected = {
@@ -504,7 +504,7 @@ class ServersControllerTest(test.TestCase):
         self.assertThat(res_dict, matchers.DictMatches(expected))
 
     def test_get_server_addresses_nonexistent_network(self):
-        url = '/v3/fake/servers/%s/ips/network_0' % FAKE_UUID
+        url = '/v3/servers/%s/ips/network_0' % FAKE_UUID
         req = fakes.HTTPRequestV3.blank(url)
         self.assertRaises(webob.exc.HTTPNotFound, self.ips_controller.show,
                           req, FAKE_UUID, 'network_0')
@@ -516,7 +516,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
 
         server_id = str(uuid.uuid4())
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s/ips' % server_id)
+        req = fakes.HTTPRequestV3.blank('/servers/%s/ips' % server_id)
         self.assertRaises(webob.exc.HTTPNotFound,
                           self.ips_controller.index, req, server_id)
 
@@ -524,14 +524,14 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        return_servers_empty)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         res_dict = self.controller.index(req)
 
         num_servers = len(res_dict['servers'])
         self.assertEqual(0, num_servers)
 
     def test_get_server_list_with_reservation_id(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?reservation_id=foo')
+        req = fakes.HTTPRequestV3.blank('/servers?reservation_id=foo')
         res_dict = self.controller.index(req)
 
         i = 0
@@ -540,7 +540,7 @@ class ServersControllerTest(test.TestCase):
             i += 1
 
     def test_get_server_list_with_reservation_id_empty(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/detail?'
+        req = fakes.HTTPRequestV3.blank('/servers/detail?'
                                       'reservation_id=foo')
         res_dict = self.controller.detail(req)
 
@@ -550,7 +550,7 @@ class ServersControllerTest(test.TestCase):
             i += 1
 
     def test_get_server_list_with_reservation_id_details(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/detail?'
+        req = fakes.HTTPRequestV3.blank('/servers/detail?'
                                       'reservation_id=foo')
         res_dict = self.controller.detail(req)
 
@@ -560,7 +560,7 @@ class ServersControllerTest(test.TestCase):
             i += 1
 
     def test_get_server_list(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         res_dict = self.controller.index(req)
 
         self.assertEqual(len(res_dict['servers']), 5)
@@ -572,18 +572,18 @@ class ServersControllerTest(test.TestCase):
             expected_links = [
                 {
                     "rel": "self",
-                    "href": "http://localhost/v3/fake/servers/%s" % s['id'],
+                    "href": "http://localhost/v3/servers/%s" % s['id'],
                 },
                 {
                     "rel": "bookmark",
-                    "href": "http://localhost/fake/servers/%s" % s['id'],
+                    "href": "http://localhost/servers/%s" % s['id'],
                 },
             ]
 
             self.assertEqual(s['links'], expected_links)
 
     def test_get_servers_with_limit(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?limit=3')
+        req = fakes.HTTPRequestV3.blank('/servers?limit=3')
         res_dict = self.controller.index(req)
 
         servers = res_dict['servers']
@@ -593,14 +593,14 @@ class ServersControllerTest(test.TestCase):
         servers_links = res_dict['servers_links']
         self.assertEqual(servers_links[0]['rel'], 'next')
         href_parts = urlparse.urlparse(servers_links[0]['href'])
-        self.assertEqual('/v3/fake/servers', href_parts.path)
+        self.assertEqual('/v3/servers', href_parts.path)
         params = urlparse.parse_qs(href_parts.query)
         expected_params = {'limit': ['3'],
                            'marker': [fakes.get_fake_uuid(2)]}
         self.assertThat(params, matchers.DictMatches(expected_params))
 
     def test_get_servers_with_limit_bad_value(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?limit=aaa')
+        req = fakes.HTTPRequestV3.blank('/servers?limit=aaa')
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.index, req)
 
@@ -608,14 +608,14 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        return_servers_empty)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/detail')
+        req = fakes.HTTPRequestV3.blank('/servers/detail')
         res_dict = self.controller.index(req)
 
         num_servers = len(res_dict['servers'])
         self.assertEqual(0, num_servers)
 
     def test_get_server_details_with_limit(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/detail?limit=3')
+        req = fakes.HTTPRequestV3.blank('/servers/detail?limit=3')
         res = self.controller.detail(req)
 
         servers = res['servers']
@@ -626,18 +626,18 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(servers_links[0]['rel'], 'next')
 
         href_parts = urlparse.urlparse(servers_links[0]['href'])
-        self.assertEqual('/v3/fake/servers', href_parts.path)
+        self.assertEqual('/v3/servers', href_parts.path)
         params = urlparse.parse_qs(href_parts.query)
         expected = {'limit': ['3'], 'marker': [fakes.get_fake_uuid(2)]}
         self.assertThat(params, matchers.DictMatches(expected))
 
     def test_get_server_details_with_limit_bad_value(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/detail?limit=aaa')
+        req = fakes.HTTPRequestV3.blank('/servers/detail?limit=aaa')
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.detail, req)
 
     def test_get_server_details_with_limit_and_other_params(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/detail'
+        req = fakes.HTTPRequestV3.blank('/servers/detail'
                                       '?limit=3&blah=2:t')
         res = self.controller.detail(req)
 
@@ -649,36 +649,36 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(servers_links[0]['rel'], 'next')
 
         href_parts = urlparse.urlparse(servers_links[0]['href'])
-        self.assertEqual('/v3/fake/servers', href_parts.path)
+        self.assertEqual('/v3/servers', href_parts.path)
         params = urlparse.parse_qs(href_parts.query)
         expected = {'limit': ['3'], 'blah': ['2:t'],
                     'marker': [fakes.get_fake_uuid(2)]}
         self.assertThat(params, matchers.DictMatches(expected))
 
     def test_get_servers_with_too_big_limit(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?limit=30')
+        req = fakes.HTTPRequestV3.blank('/servers?limit=30')
         res_dict = self.controller.index(req)
         self.assertTrue('servers_links' not in res_dict)
 
     def test_get_servers_with_bad_limit(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?limit=asdf')
+        req = fakes.HTTPRequestV3.blank('/servers?limit=asdf')
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.index, req)
 
     def test_get_servers_with_marker(self):
-        url = '/v3/fake/servers?marker=%s' % fakes.get_fake_uuid(2)
+        url = '/v3/servers?marker=%s' % fakes.get_fake_uuid(2)
         req = fakes.HTTPRequestV3.blank(url)
         servers = self.controller.index(req)['servers']
         self.assertEqual([s['name'] for s in servers], ["server4", "server5"])
 
     def test_get_servers_with_limit_and_marker(self):
-        url = '/v3/fake/servers?limit=2&marker=%s' % fakes.get_fake_uuid(1)
+        url = '/v3/servers?limit=2&marker=%s' % fakes.get_fake_uuid(1)
         req = fakes.HTTPRequestV3.blank(url)
         servers = self.controller.index(req)['servers']
         self.assertEqual([s['name'] for s in servers], ['server3', 'server4'])
 
     def test_get_servers_with_bad_marker(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?limit=2&marker=asdf')
+        req = fakes.HTTPRequestV3.blank('/servers?limit=2&marker=asdf')
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.index, req)
 
@@ -692,7 +692,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?unknownoption=whee')
+        req = fakes.HTTPRequestV3.blank('/servers?unknownoption=whee')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -711,7 +711,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?image=12345')
+        req = fakes.HTTPRequestV3.blank('/servers?image=12345')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -728,7 +728,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?tenant_id=fake',
+        req = fakes.HTTPRequestV3.blank('/servers?tenant_id=fake',
                                       use_admin_context=True)
         res = self.controller.index(req)
 
@@ -744,7 +744,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers',
+        req = fakes.HTTPRequestV3.blank('/servers',
                                       use_admin_context=True)
         res = self.controller.index(req)
 
@@ -769,7 +769,7 @@ class ServersControllerTest(test.TestCase):
 
         common_policy.set_rules(common_policy.Rules(rules))
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?all_tenants=1')
+        req = fakes.HTTPRequestV3.blank('/servers?all_tenants=1')
         res = self.controller.index(req)
 
         self.assertTrue('servers' in res)
@@ -791,7 +791,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?all_tenants=1')
+        req = fakes.HTTPRequestV3.blank('/servers?all_tenants=1')
         self.assertRaises(exception.PolicyNotAuthorized,
                           self.controller.index, req)
 
@@ -809,14 +809,14 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?flavor=12345')
+        req = fakes.HTTPRequestV3.blank('/servers?flavor=12345')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
         self.assertEqual(servers[0]['id'], server_uuid)
 
     def test_get_servers_with_bad_flavor(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?flavor=abcde')
+        req = fakes.HTTPRequestV3.blank('/servers?flavor=abcde')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 0)
@@ -834,7 +834,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?status=active')
+        req = fakes.HTTPRequestV3.blank('/servers?status=active')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -842,13 +842,13 @@ class ServersControllerTest(test.TestCase):
 
     def test_get_servers_invalid_status(self):
         # Test getting servers by invalid status.
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?status=baloney',
+        req = fakes.HTTPRequestV3.blank('/servers?status=baloney',
                                       use_admin_context=False)
         servers = self.controller.index(req)['servers']
         self.assertEqual(len(servers), 0)
 
     def test_get_servers_deleted_status_as_user(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?status=deleted',
+        req = fakes.HTTPRequestV3.blank('/servers?status=deleted',
                                       use_admin_context=False)
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.detail, req)
@@ -866,7 +866,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?status=deleted',
+        req = fakes.HTTPRequestV3.blank('/servers?status=deleted',
                                       use_admin_context=True)
 
         servers = self.controller.detail(req)['servers']
@@ -886,7 +886,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?name=whee.*')
+        req = fakes.HTTPRequestV3.blank('/servers?name=whee.*')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -909,7 +909,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
         params = 'changes-since=2011-01-24T17:08:01Z'
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?%s' % params)
+        req = fakes.HTTPRequestV3.blank('/servers?%s' % params)
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -917,7 +917,7 @@ class ServersControllerTest(test.TestCase):
 
     def test_get_servers_allows_changes_since_bad_value(self):
         params = 'changes-since=asdf'
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?%s' % params)
+        req = fakes.HTTPRequestV3.blank('/servers?%s' % params)
         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.index, req)
 
     def test_get_servers_admin_filters_as_user(self):
@@ -943,7 +943,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
         query_str = "name=foo&ip=10.*&status=active&unknown_option=meow"
-        req = fakes.HTTPRequest.blank('/v3/fake/servers?%s' % query_str)
+        req = fakes.HTTPRequest.blank('/servers?%s' % query_str)
         res = self.controller.index(req)
 
         servers = res['servers']
@@ -972,7 +972,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
         query_str = "name=foo&ip=10.*&status=active&unknown_option=meow"
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?%s' % query_str,
+        req = fakes.HTTPRequestV3.blank('/servers?%s' % query_str,
                                       use_admin_context=True)
         servers = self.controller.index(req)['servers']
 
@@ -994,7 +994,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?ip=10\..*')
+        req = fakes.HTTPRequestV3.blank('/servers?ip=10\..*')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -1016,7 +1016,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers?ip6=ffff.*',
+        req = fakes.HTTPRequestV3.blank('/servers?ip6=ffff.*',
                                       use_admin_context=True)
         servers = self.controller.index(req)['servers']
 
@@ -1028,7 +1028,7 @@ class ServersControllerTest(test.TestCase):
                 fakes.fake_instance_get(name='server_test',
                                         access_ipv4='0.0.0.0',
                                         access_ipv6='beef::0123'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {
@@ -1045,7 +1045,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(res_dict['server']['accessIPv6'], 'beef::0123')
 
     def test_update_server_invalid_xml_raises_lookup(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/xml'
         #xml request which raises LookupError
@@ -1057,7 +1057,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(res.status_int, 400)
 
     def test_update_server_invalid_xml_raises_expat(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/xml'
         #xml request which raises ExpatError
@@ -1071,7 +1071,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_name(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(name='server_test'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'name': 'server_test'}}
@@ -1084,7 +1084,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_name_too_long(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(name='server_test'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'name': 'x' * 256}}
@@ -1095,7 +1095,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv4(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv4': '0.0.0.0'}}
@@ -1108,7 +1108,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv4_bad_format(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv4': 'bad_format'}}
@@ -1119,7 +1119,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv4_none(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv4': None}}
@@ -1132,7 +1132,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv4_blank(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv4': ''}}
@@ -1145,7 +1145,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv6(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv6='beef::0123'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv6': 'beef::0123'}}
@@ -1158,7 +1158,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv6_bad_format(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv6='beef::0123'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv6': 'bad_format'}}
@@ -1169,7 +1169,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv6_none(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv6='beef::0123'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv6': None}}
@@ -1182,7 +1182,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv6_blank(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv6='beef::0123'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv6': ''}}
@@ -1193,7 +1193,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(res_dict['server']['accessIPv6'], '')
 
     def test_update_server_personality(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {
@@ -1223,7 +1223,7 @@ class ServersControllerTest(test.TestCase):
         #        self.stubs.Set(db, 'instance_get',
         #                return_server_with_attributes(name='server_test'))
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = "application/json"
         req.body = jsonutils.dumps(body)
@@ -1237,7 +1237,7 @@ class ServersControllerTest(test.TestCase):
             raise exception.InstanceNotFound(instance_id='fake')
 
         self.stubs.Set(compute_api.API, 'get', fake_get)
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'name': 'server_test'}}
@@ -1250,7 +1250,7 @@ class ServersControllerTest(test.TestCase):
             raise exception.InstanceNotFound(instance_id='fake')
 
         self.stubs.Set(compute_api.API, 'update', fake_update)
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'name': 'server_test'}}
@@ -1263,7 +1263,7 @@ class ServersControllerTest(test.TestCase):
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         access_ipv4 = 'bad_format'
         access_ipv6 = 'fead::1234'
         body = {
@@ -1285,7 +1285,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1297,7 +1297,7 @@ class ServersControllerTest(test.TestCase):
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         access_ipv4 = '0.0.0.0'
         access_ipv6 = 'fead::1234'
         body = {
@@ -1319,7 +1319,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1331,7 +1331,7 @@ class ServersControllerTest(test.TestCase):
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         access_ipv4 = '0.0.0.0'
         access_ipv6 = 'fead::1234'
         body = {
@@ -1353,7 +1353,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1365,7 +1365,7 @@ class ServersControllerTest(test.TestCase):
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         access_ipv4 = '0.0.0.0'
         access_ipv6 = 'fead::1234'
         body = {
@@ -1387,7 +1387,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1407,7 +1407,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid',
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         body = {
             'rebuild': {
                 'name': 'new_name',
@@ -1415,7 +1415,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1435,7 +1435,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid',
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         body = {
             'rebuild': {
                 'name': 'new_name',
@@ -1443,7 +1443,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1464,7 +1464,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid',
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         body = {
             'rebuild': {
                 'name': 'new_name',
@@ -1472,7 +1472,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1490,7 +1490,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid',
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         body = {
             'rebuild': {
                 'name': 'new_name',
@@ -1498,7 +1498,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1510,7 +1510,7 @@ class ServersControllerTest(test.TestCase):
                 fakes.fake_instance_get(vm_state=vm_states.ACTIVE))
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
         access_ipv4 = '1.2.3.4'
         access_ipv6 = 'bad_format'
         body = {
@@ -1532,7 +1532,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/a/action')
+        req = fakes.HTTPRequestV3.blank('/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1545,7 +1545,7 @@ class ServersControllerTest(test.TestCase):
             "links": [
                 {
                     "rel": "bookmark",
-                    "href": 'http://localhost/fake/flavors/1',
+                    "href": 'http://localhost/flavors/1',
                 },
             ],
         }
@@ -1554,11 +1554,11 @@ class ServersControllerTest(test.TestCase):
             "links": [
                 {
                     "rel": "bookmark",
-                    "href": 'http://localhost/fake/images/10',
+                    "href": 'http://localhost/images/10',
                 },
             ],
         }
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/detail')
+        req = fakes.HTTPRequestV3.blank('/servers/detail')
         res_dict = self.controller.detail(req)
 
         for i, s in enumerate(res_dict['servers']):
@@ -1586,7 +1586,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                 return_servers_with_host)
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/detail')
+        req = fakes.HTTPRequestV3.blank('/servers/detail')
         res_dict = self.controller.detail(req)
 
         server_list = res_dict['servers']
@@ -1601,7 +1601,7 @@ class ServersControllerTest(test.TestCase):
 
     def _delete_server_instance(self, uuid=FAKE_UUID):
         fakes.stub_out_instance_quota(self.stubs, 0, 10)
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % uuid)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % uuid)
         req.method = 'DELETE'
 
         self.server_delete_called = False
@@ -1626,7 +1626,7 @@ class ServersControllerTest(test.TestCase):
 
     def test_delete_server_instance_while_building(self):
         fakes.stub_out_instance_quota(self.stubs, 0, 10)
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'DELETE'
 
         self.server_delete_called = False
@@ -1640,7 +1640,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(self.server_delete_called, True)
 
     def test_delete_server_instance_while_resize(self):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'DELETE'
 
         self.server_delete_called = False
@@ -1673,7 +1673,7 @@ class ServerStatusTest(test.TestCase):
                 fakes.fake_instance_get(vm_state=vm_state,
                                         task_state=task_state))
 
-        request = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        request = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         return self.controller.show(request, FAKE_UUID)
 
     def test_active(self):
@@ -1699,7 +1699,7 @@ class ServerStatusTest(test.TestCase):
         rule = {'compute:reboot':
                 common_policy.parse_rule('role:admin')}
         common_policy.set_rules(common_policy.Rules(rule))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/1234/action')
+        req = fakes.HTTPRequestV3.blank('/servers/1234/action')
         self.assertRaises(exception.PolicyNotAuthorized,
                 self.controller._action_reboot, req, '1234',
                 {'reboot': {'type': 'HARD'}})
@@ -1727,7 +1727,7 @@ class ServerStatusTest(test.TestCase):
         rule = {'compute:confirm_resize':
                 common_policy.parse_rule('role:admin')}
         common_policy.set_rules(common_policy.Rules(rule))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/1234/action')
+        req = fakes.HTTPRequestV3.blank('/servers/1234/action')
         self.assertRaises(exception.PolicyNotAuthorized,
                 self.controller._action_confirm_resize, req, '1234', {})
 
@@ -1749,7 +1749,7 @@ class ServerStatusTest(test.TestCase):
         rule = {'compute:revert_resize':
                 common_policy.parse_rule('role:admin')}
         common_policy.set_rules(common_policy.Rules(rule))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/1234/action')
+        req = fakes.HTTPRequestV3.blank('/servers/1234/action')
         self.assertRaises(exception.PolicyNotAuthorized,
                 self.controller._action_revert_resize, req, '1234', {})
 
@@ -1881,7 +1881,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_uuid, flavorRef=2,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1902,7 +1902,7 @@ class ServersControllerCreateTest(test.TestCase):
                 'flavorRef': flavor_ref,
             }
         }
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1943,7 +1943,7 @@ class ServersControllerCreateTest(test.TestCase):
         self.addCleanup(image_service.update, context, image_uuid,
                         {'status': 'active'})
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         body = dict(server=dict(
             name='server_test', imageRef=image_uuid, flavorRef=2,
@@ -1973,7 +1973,7 @@ class ServersControllerCreateTest(test.TestCase):
         self.addCleanup(image_service.update, context, image_uuid,
                         {'size': orig_size})
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         body = dict(server=dict(name='server_test',
                                 imageRef=image_uuid,
@@ -2001,7 +2001,7 @@ class ServersControllerCreateTest(test.TestCase):
     #             'flavorRef': flavor_ref,
     #         }
     #     }
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2025,7 +2025,7 @@ class ServersControllerCreateTest(test.TestCase):
     #             'flavorRef': flavor_ref,
     #         }
     #     }
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2049,7 +2049,7 @@ class ServersControllerCreateTest(test.TestCase):
     #             'flavorRef': flavor_ref,
     #         }
     #     }
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2073,7 +2073,7 @@ class ServersControllerCreateTest(test.TestCase):
     #             'flavorRef': flavor_ref,
     #         }
     #     }
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2103,7 +2103,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         }
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2134,7 +2134,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         }
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2165,7 +2165,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         }
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2247,7 +2247,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         }
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2272,7 +2272,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         }
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -2281,8 +2281,8 @@ class ServersControllerCreateTest(test.TestCase):
 
     def test_create_instance_image_ref_is_bookmark(self):
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/fake/images/%s' % image_uuid
-        flavor_ref = 'http://localhost/fake/flavors/3'
+        image_href = 'http://localhost/images/%s' % image_uuid
+        flavor_ref = 'http://localhost/flavors/3'
         body = {
             'server': {
                 'name': 'server_test',
@@ -2291,7 +2291,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2302,8 +2302,8 @@ class ServersControllerCreateTest(test.TestCase):
 
     def test_create_instance_image_ref_is_invalid(self):
         image_uuid = 'this_is_not_a_valid_uuid'
-        image_href = 'http://localhost/fake/images/%s' % image_uuid
-        flavor_ref = 'http://localhost/fake/flavors/3'
+        image_href = 'http://localhost/images/%s' % image_uuid
+        flavor_ref = 'http://localhost/flavors/3'
         body = {
             'server': {
                 'name': 'server_test',
@@ -2312,7 +2312,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2330,7 +2330,7 @@ class ServersControllerCreateTest(test.TestCase):
             server.pop('imageRef', None)
         server.update(params)
         body = dict(server=server)
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2764,8 +2764,8 @@ class ServersControllerCreateTest(test.TestCase):
     def test_create_instance_with_access_ip(self):
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
-        flavor_ref = 'http://localhost/fake/flavors/3'
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
+        flavor_ref = 'http://localhost/flavors/3'
         access_ipv4 = '1.2.3.4'
         access_ipv6 = 'fead::1234'
         body = {
@@ -2788,7 +2788,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2804,8 +2804,8 @@ class ServersControllerCreateTest(test.TestCase):
 
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
-        flavor_ref = 'http://localhost/fake/flavors/3'
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
+        flavor_ref = 'http://localhost/flavors/3'
         access_ipv4 = '1.2.3.4'
         access_ipv6 = 'fead::1234'
         body = {
@@ -2828,7 +2828,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2841,8 +2841,8 @@ class ServersControllerCreateTest(test.TestCase):
     def test_create_instance_bad_format_access_ip_v4(self):
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
-        flavor_ref = 'http://localhost/fake/flavors/3'
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
+        flavor_ref = 'http://localhost/flavors/3'
         access_ipv4 = 'bad_format'
         access_ipv6 = 'fead::1234'
         body = {
@@ -2865,7 +2865,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2875,8 +2875,8 @@ class ServersControllerCreateTest(test.TestCase):
     def test_create_instance_bad_format_access_ip_v6(self):
         # proper local hrefs must start with 'http://localhost/v3/'
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
-        image_href = 'http://localhost/v3/fake/images/%s' % image_uuid
-        flavor_ref = 'http://localhost/fake/flavors/3'
+        image_href = 'http://localhost/v3/images/%s' % image_uuid
+        flavor_ref = 'http://localhost/flavors/3'
         access_ipv4 = '1.2.3.4'
         access_ipv6 = 'bad_format'
         body = {
@@ -2899,7 +2899,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2930,7 +2930,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2961,7 +2961,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2996,7 +2996,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3024,7 +3024,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3048,7 +3048,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3072,7 +3072,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3096,7 +3096,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3110,7 +3110,7 @@ class ServersControllerCreateTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             key_name='nonexistentkey'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3124,7 +3124,7 @@ class ServersControllerCreateTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             key_name='key'))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3140,7 +3140,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3149,13 +3149,13 @@ class ServersControllerCreateTest(test.TestCase):
                           self.controller.create, req, body)
 
     def test_create_instance_invalid_flavor_id_int(self):
-        image_href = 'http://localhost/v3/fake/images/2'
+        image_href = 'http://localhost/v3/images/2'
         flavor_ref = -1
         body = dict(server=dict(
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3170,7 +3170,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3198,7 +3198,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         },
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -3227,7 +3227,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         },
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -3256,7 +3256,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         },
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -3283,7 +3283,7 @@ class ServersControllerCreateTest(test.TestCase):
     #         },
     #     }
 
-    #     req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+    #     req = fakes.HTTPRequestV3.blank('/servers')
     #     req.method = 'POST'
     #     req.body = jsonutils.dumps(body)
     #     req.headers["content-type"] = "application/json"
@@ -3311,7 +3311,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3330,7 +3330,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3350,7 +3350,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers['content-type'] = "application/json"
@@ -3371,7 +3371,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers['content-type'] = "application/json"
@@ -3392,7 +3392,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers['content-type'] = "application/json"
@@ -3430,7 +3430,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3438,8 +3438,8 @@ class ServersControllerCreateTest(test.TestCase):
                           self.controller.create, req, body)
 
     def test_create_location(self):
-        selfhref = 'http://localhost/v3/fake/servers/%s' % FAKE_UUID
-        bookhref = 'http://localhost/fake/servers/%s' % FAKE_UUID
+        selfhref = 'http://localhost/v3/servers/%s' % FAKE_UUID
+        bookhref = 'http://localhost/servers/%s' % FAKE_UUID
         image_uuid = '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'
         image_href = 'http://localhost/v3/images/%s' % image_uuid
         flavor_ref = 'http://localhost/123/flavors/3'
@@ -3461,7 +3461,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers['content-type'] = 'application/json'
@@ -3477,7 +3477,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_uuid, flavorRef=3,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -4255,10 +4255,10 @@ class ServersViewBuilderTest(test.TestCase):
 
         self.uuid = self.instance['uuid']
         self.view_builder = views.servers.ViewBuilder()
-        self.request = fakes.HTTPRequestV3.blank("/v2")
+        self.request = fakes.HTTPRequestV3.blank("")
 
     def test_get_flavor_valid_instance_type(self):
-        flavor_bookmark = "http://localhost/fake/flavors/1"
+        flavor_bookmark = "http://localhost/flavors/1"
         expected = {"id": "1",
                     "links": [{"rel": "bookmark",
                                "href": flavor_bookmark}]}
@@ -4266,8 +4266,8 @@ class ServersViewBuilderTest(test.TestCase):
         self.assertEqual(result, expected)
 
     def test_build_server(self):
-        self_link = "http://localhost/v3/fake/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
+        self_link = "http://localhost/v3/servers/%s" % self.uuid
+        bookmark_link = "http://localhost/servers/%s" % self.uuid
         expected_server = {
             "server": {
                 "id": self.uuid,
@@ -4296,12 +4296,12 @@ class ServersViewBuilderTest(test.TestCase):
                 "links": [
                     {
                         "rel": "self",
-                        "href": "http://localhost/v3/fake/servers/%s" %
+                        "href": "http://localhost/v3/servers/%s" %
                                 self.uuid,
                     },
                     {
                         "rel": "bookmark",
-                        "href": "http://localhost/fake/servers/%s" % self.uuid,
+                        "href": "http://localhost/servers/%s" % self.uuid,
                     },
                 ],
             }
@@ -4311,10 +4311,10 @@ class ServersViewBuilderTest(test.TestCase):
         self.assertThat(output, matchers.DictMatches(expected_server))
 
     def test_build_server_detail(self):
-        image_bookmark = "http://localhost/fake/images/5"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
-        self_link = "http://localhost/v3/fake/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
+        image_bookmark = "http://localhost/images/5"
+        flavor_bookmark = "http://localhost/flavors/1"
+        self_link = "http://localhost/v3/servers/%s" % self.uuid
+        bookmark_link = "http://localhost/servers/%s" % self.uuid
         expected_server = {
             "server": {
                 "id": self.uuid,
@@ -4384,10 +4384,10 @@ class ServersViewBuilderTest(test.TestCase):
             'created_at': datetime.datetime(2010, 10, 10, 12, 0, 0),
         }
 
-        image_bookmark = "http://localhost/fake/images/5"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
-        self_link = "http://localhost/v3/fake/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
+        image_bookmark = "http://localhost/images/5"
+        flavor_bookmark = "http://localhost/flavors/1"
+        self_link = "http://localhost/v3/servers/%s" % self.uuid
+        bookmark_link = "http://localhost/servers/%s" % self.uuid
         expected_server = {
             "server": {
                 "id": self.uuid,
@@ -4517,10 +4517,10 @@ class ServersViewBuilderTest(test.TestCase):
             'created_at': datetime.datetime(2010, 10, 10, 12, 0, 0),
         }
 
-        image_bookmark = "http://localhost/fake/images/5"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
-        self_link = "http://localhost/v3/fake/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
+        image_bookmark = "http://localhost/images/5"
+        flavor_bookmark = "http://localhost/flavors/1"
+        self_link = "http://localhost/v3/servers/%s" % self.uuid
+        bookmark_link = "http://localhost/servers/%s" % self.uuid
 
         output = self.view_builder.show(self.request, self.instance)
         self.assertFalse('fault' in output['server'])
@@ -4529,10 +4529,10 @@ class ServersViewBuilderTest(test.TestCase):
         #set the power state of the instance to running
         self.instance['vm_state'] = vm_states.ACTIVE
         self.instance['progress'] = 100
-        image_bookmark = "http://localhost/fake/images/5"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
-        self_link = "http://localhost/v3/fake/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
+        image_bookmark = "http://localhost/images/5"
+        flavor_bookmark = "http://localhost/flavors/1"
+        self_link = "http://localhost/v3/servers/%s" % self.uuid
+        bookmark_link = "http://localhost/servers/%s" % self.uuid
         expected_server = {
             "server": {
                 "id": self.uuid,
@@ -4591,10 +4591,10 @@ class ServersViewBuilderTest(test.TestCase):
 
         self.instance['access_ip_v4'] = '1.2.3.4'
 
-        image_bookmark = "http://localhost/fake/images/5"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
-        self_link = "http://localhost/v3/fake/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
+        image_bookmark = "http://localhost/images/5"
+        flavor_bookmark = "http://localhost/flavors/1"
+        self_link = "http://localhost/v3/servers/%s" % self.uuid
+        bookmark_link = "http://localhost/servers/%s" % self.uuid
         expected_server = {
             "server": {
                 "id": self.uuid,
@@ -4653,10 +4653,10 @@ class ServersViewBuilderTest(test.TestCase):
 
         self.instance['access_ip_v6'] = 'fead::1234'
 
-        image_bookmark = "http://localhost/fake/images/5"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
-        self_link = "http://localhost/v3/fake/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
+        image_bookmark = "http://localhost/images/5"
+        flavor_bookmark = "http://localhost/flavors/1"
+        self_link = "http://localhost/v3/servers/%s" % self.uuid
+        bookmark_link = "http://localhost/servers/%s" % self.uuid
         expected_server = {
             "server": {
                 "id": self.uuid,
@@ -4717,10 +4717,10 @@ class ServersViewBuilderTest(test.TestCase):
         metadata.append(models.InstanceMetadata(key="Open", value="Stack"))
         self.instance['metadata'] = metadata
 
-        image_bookmark = "http://localhost/fake/images/5"
-        flavor_bookmark = "http://localhost/fake/flavors/1"
-        self_link = "http://localhost/v3/fake/servers/%s" % self.uuid
-        bookmark_link = "http://localhost/fake/servers/%s" % self.uuid
+        image_bookmark = "http://localhost/images/5"
+        flavor_bookmark = "http://localhost/flavors/1"
+        self_link = "http://localhost/v3/servers/%s" % self.uuid
+        bookmark_link = "http://localhost/servers/%s" % self.uuid
         expected_server = {
             "server": {
                 "id": self.uuid,
@@ -5777,7 +5777,7 @@ class ServersUnprocessableEntityTestCase(test.TestCase):
         self.controller = servers.ServersController(extension_info=ext_info)
 
     def _unprocessable_server_create(self, body):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers')
+        req = fakes.HTTPRequestV3.blank('/servers')
         req.method = 'POST'
 
         self.assertRaises(webob.exc.HTTPUnprocessableEntity,
@@ -5795,7 +5795,7 @@ class ServersUnprocessableEntityTestCase(test.TestCase):
         self._unprocessable_server_create(body=body)
 
     def _unprocessable_server_update(self, body):
-        req = fakes.HTTPRequestV3.blank('/v3/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequestV3.blank('/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
 
         self.assertRaises(webob.exc.HTTPUnprocessableEntity,
diff --git a/nova/tests/api/openstack/compute/test_flavors.py b/nova/tests/api/openstack/compute/test_flavors.py
index 77e637044..3741fcd33 100644
--- a/nova/tests/api/openstack/compute/test_flavors.py
+++ b/nova/tests/api/openstack/compute/test_flavors.py
@@ -792,6 +792,7 @@ class ParseIsPublicTest(test.TestCase):
 
     def test_string_none(self):
         self.assertPublic(None, 'none')
+        self.assertPublic(None, 'None')
 
     def test_other(self):
         self.assertRaises(
diff --git a/nova/tests/api/openstack/compute/test_limits.py b/nova/tests/api/openstack/compute/test_limits.py
index b9dc72b1f..3dbc7bfea 100644
--- a/nova/tests/api/openstack/compute/test_limits.py
+++ b/nova/tests/api/openstack/compute/test_limits.py
@@ -32,14 +32,18 @@ from nova.openstack.common import jsonutils
 from nova import test
 from nova.tests.api.openstack import fakes
 from nova.tests import matchers
+from nova import utils
 
 
 TEST_LIMITS = [
-    limits.Limit("GET", "/delayed", "^/delayed", 1, limits.PER_MINUTE),
-    limits.Limit("POST", "*", ".*", 7, limits.PER_MINUTE),
-    limits.Limit("POST", "/servers", "^/servers", 3, limits.PER_MINUTE),
-    limits.Limit("PUT", "*", "", 10, limits.PER_MINUTE),
-    limits.Limit("PUT", "/servers", "^/servers", 5, limits.PER_MINUTE),
+    limits.Limit("GET", "/delayed", "^/delayed", 1,
+                 utils.TIME_UNITS['MINUTE']),
+    limits.Limit("POST", "*", ".*", 7, utils.TIME_UNITS['MINUTE']),
+    limits.Limit("POST", "/servers", "^/servers", 3,
+                 utils.TIME_UNITS['MINUTE']),
+    limits.Limit("PUT", "*", "", 10, utils.TIME_UNITS['MINUTE']),
+    limits.Limit("PUT", "/servers", "^/servers", 5,
+                 utils.TIME_UNITS['MINUTE']),
 ]
 NS = {
     'atom': 'http://www.w3.org/2005/Atom',
@@ -312,7 +316,7 @@ class LimitsControllerTest(BaseLimitTestSuite):
                           req, 1, {})
 
 
-class TestLimiter(limits.Limiter):
+class MockLimiter(limits.Limiter):
     pass
 
 
@@ -331,12 +335,12 @@ class LimitMiddlewareTest(BaseLimitTestSuite):
         super(LimitMiddlewareTest, self).setUp()
         _limits = '(GET, *, .*, 1, MINUTE)'
         self.app = limits.RateLimitingMiddleware(self._empty_app, _limits,
-                                                 "%s.TestLimiter" %
+                                                 "%s.MockLimiter" %
                                                  self.__class__.__module__)
 
     def test_limit_class(self):
         # Test that middleware selected correct limiter class.
-        assert isinstance(self.app._limiter, TestLimiter)
+        assert isinstance(self.app._limiter, MockLimiter)
 
     def test_good_request(self):
         # Test successful GET request through middleware.
@@ -485,8 +489,8 @@ class ParseLimitsTest(BaseLimitTestSuite):
         self.assertEqual([t.value for t in l], expected)
 
         # ...and the units...
-        expected = [limits.PER_MINUTE, limits.PER_HOUR,
-                    limits.PER_SECOND, limits.PER_DAY]
+        expected = [utils.TIME_UNITS['MINUTE'], utils.TIME_UNITS['HOUR'],
+                    utils.TIME_UNITS['SECOND'], utils.TIME_UNITS['DAY']]
         self.assertEqual([t.unit for t in l], expected)
 
 
diff --git a/nova/tests/api/openstack/compute/test_servers.py b/nova/tests/api/openstack/compute/test_servers.py
index af8a4a276..8eebec613 100644
--- a/nova/tests/api/openstack/compute/test_servers.py
+++ b/nova/tests/api/openstack/compute/test_servers.py
@@ -231,7 +231,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEquals(res, [(None, None, port)])
 
     def test_get_server_by_uuid(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         res_dict = self.controller.show(req, FAKE_UUID)
         self.assertEqual(res_dict['server']['id'], FAKE_UUID)
 
@@ -250,7 +250,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get',
                        return_instance_with_host)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         server1 = self.controller.show(req, FAKE_UUID)
         server2 = self.controller.show(req, FAKE_UUID)
 
@@ -263,7 +263,7 @@ class ServersControllerTest(test.TestCase):
         flavor_bookmark = "http://localhost/fake/flavors/1"
 
         uuid = FAKE_UUID
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % uuid)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % uuid)
         res_dict = self.controller.show(req, uuid)
 
         expected_server = {
@@ -330,7 +330,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid', new_return_server)
 
         uuid = FAKE_UUID
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % uuid)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % uuid)
         res_dict = self.controller.show(req, uuid)
         expected_server = {
             "server": {
@@ -399,7 +399,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid', new_return_server)
 
         uuid = FAKE_UUID
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % uuid)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % uuid)
         res_dict = self.controller.show(req, uuid)
         expected_server = {
             "server": {
@@ -488,7 +488,7 @@ class ServersControllerTest(test.TestCase):
         return_server = fakes.fake_instance_get(nw_cache=nw_cache)
         self.stubs.Set(db, 'instance_get_by_uuid', return_server)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s/ips' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s/ips' % FAKE_UUID)
         res_dict = self.ips_controller.index(req, FAKE_UUID)
 
         expected = {
@@ -508,7 +508,7 @@ class ServersControllerTest(test.TestCase):
         self.assertThat(res_dict, matchers.DictMatches(expected))
 
     def test_get_server_addresses_nonexistent_network(self):
-        url = '/v2/fake/servers/%s/ips/network_0' % FAKE_UUID
+        url = '/fake/servers/%s/ips/network_0' % FAKE_UUID
         req = fakes.HTTPRequest.blank(url)
         self.assertRaises(webob.exc.HTTPNotFound, self.ips_controller.show,
                           req, FAKE_UUID, 'network_0')
@@ -520,7 +520,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_by_uuid', fake_instance_get)
 
         server_id = str(uuid.uuid4())
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s/ips' % server_id)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s/ips' % server_id)
         self.assertRaises(webob.exc.HTTPNotFound,
                           self.ips_controller.index, req, server_id)
 
@@ -528,14 +528,14 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        return_servers_empty)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         res_dict = self.controller.index(req)
 
         num_servers = len(res_dict['servers'])
         self.assertEqual(0, num_servers)
 
     def test_get_server_list_with_reservation_id(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?reservation_id=foo')
+        req = fakes.HTTPRequest.blank('/fake/servers?reservation_id=foo')
         res_dict = self.controller.index(req)
 
         i = 0
@@ -544,7 +544,7 @@ class ServersControllerTest(test.TestCase):
             i += 1
 
     def test_get_server_list_with_reservation_id_empty(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail?'
+        req = fakes.HTTPRequest.blank('/fake/servers/detail?'
                                       'reservation_id=foo')
         res_dict = self.controller.detail(req)
 
@@ -554,7 +554,7 @@ class ServersControllerTest(test.TestCase):
             i += 1
 
     def test_get_server_list_with_reservation_id_details(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail?'
+        req = fakes.HTTPRequest.blank('/fake/servers/detail?'
                                       'reservation_id=foo')
         res_dict = self.controller.detail(req)
 
@@ -564,7 +564,7 @@ class ServersControllerTest(test.TestCase):
             i += 1
 
     def test_get_server_list(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         res_dict = self.controller.index(req)
 
         self.assertEqual(len(res_dict['servers']), 5)
@@ -587,7 +587,7 @@ class ServersControllerTest(test.TestCase):
             self.assertEqual(s['links'], expected_links)
 
     def test_get_servers_with_limit(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?limit=3')
+        req = fakes.HTTPRequest.blank('/fake/servers?limit=3')
         res_dict = self.controller.index(req)
 
         servers = res_dict['servers']
@@ -604,7 +604,7 @@ class ServersControllerTest(test.TestCase):
         self.assertThat(params, matchers.DictMatches(expected_params))
 
     def test_get_servers_with_limit_bad_value(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?limit=aaa')
+        req = fakes.HTTPRequest.blank('/fake/servers?limit=aaa')
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.index, req)
 
@@ -612,14 +612,14 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        return_servers_empty)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail')
+        req = fakes.HTTPRequest.blank('/fake/servers/detail')
         res_dict = self.controller.index(req)
 
         num_servers = len(res_dict['servers'])
         self.assertEqual(0, num_servers)
 
     def test_get_server_details_with_limit(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail?limit=3')
+        req = fakes.HTTPRequest.blank('/fake/servers/detail?limit=3')
         res = self.controller.detail(req)
 
         servers = res['servers']
@@ -636,12 +636,12 @@ class ServersControllerTest(test.TestCase):
         self.assertThat(params, matchers.DictMatches(expected))
 
     def test_get_server_details_with_limit_bad_value(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail?limit=aaa')
+        req = fakes.HTTPRequest.blank('/fake/servers/detail?limit=aaa')
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.detail, req)
 
     def test_get_server_details_with_limit_and_other_params(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail'
+        req = fakes.HTTPRequest.blank('/fake/servers/detail'
                                       '?limit=3&blah=2:t')
         res = self.controller.detail(req)
 
@@ -660,12 +660,12 @@ class ServersControllerTest(test.TestCase):
         self.assertThat(params, matchers.DictMatches(expected))
 
     def test_get_servers_with_too_big_limit(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?limit=30')
+        req = fakes.HTTPRequest.blank('/fake/servers?limit=30')
         res_dict = self.controller.index(req)
         self.assertTrue('servers_links' not in res_dict)
 
     def test_get_servers_with_bad_limit(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?limit=asdf')
+        req = fakes.HTTPRequest.blank('/fake/servers?limit=asdf')
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.index, req)
 
@@ -682,7 +682,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual([s['name'] for s in servers], ['server3', 'server4'])
 
     def test_get_servers_with_bad_marker(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?limit=2&marker=asdf')
+        req = fakes.HTTPRequest.blank('/fake/servers?limit=2&marker=asdf')
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.index, req)
 
@@ -696,7 +696,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?unknownoption=whee')
+        req = fakes.HTTPRequest.blank('/fake/servers?unknownoption=whee')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -715,7 +715,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?image=12345')
+        req = fakes.HTTPRequest.blank('/fake/servers?image=12345')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -732,7 +732,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?tenant_id=fake',
+        req = fakes.HTTPRequest.blank('/fake/servers?tenant_id=fake',
                                       use_admin_context=True)
         res = self.controller.index(req)
 
@@ -748,7 +748,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers',
+        req = fakes.HTTPRequest.blank('/fake/servers',
                                       use_admin_context=True)
         res = self.controller.index(req)
 
@@ -773,7 +773,7 @@ class ServersControllerTest(test.TestCase):
 
         common_policy.set_rules(common_policy.Rules(rules))
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?all_tenants=1')
+        req = fakes.HTTPRequest.blank('/fake/servers?all_tenants=1')
         res = self.controller.index(req)
 
         self.assertTrue('servers' in res)
@@ -795,7 +795,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                        fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?all_tenants=1')
+        req = fakes.HTTPRequest.blank('/fake/servers?all_tenants=1')
         self.assertRaises(exception.PolicyNotAuthorized,
                           self.controller.index, req)
 
@@ -813,14 +813,14 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?flavor=12345')
+        req = fakes.HTTPRequest.blank('/fake/servers?flavor=12345')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
         self.assertEqual(servers[0]['id'], server_uuid)
 
     def test_get_servers_with_bad_flavor(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?flavor=abcde')
+        req = fakes.HTTPRequest.blank('/fake/servers?flavor=abcde')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 0)
@@ -838,7 +838,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?status=active')
+        req = fakes.HTTPRequest.blank('/fake/servers?status=active')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -846,13 +846,13 @@ class ServersControllerTest(test.TestCase):
 
     def test_get_servers_invalid_status(self):
         # Test getting servers by invalid status.
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?status=baloney',
+        req = fakes.HTTPRequest.blank('/fake/servers?status=baloney',
                                       use_admin_context=False)
         servers = self.controller.index(req)['servers']
         self.assertEqual(len(servers), 0)
 
     def test_get_servers_deleted_status_as_user(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?status=deleted',
+        req = fakes.HTTPRequest.blank('/fake/servers?status=deleted',
                                       use_admin_context=False)
         self.assertRaises(webob.exc.HTTPBadRequest,
                           self.controller.detail, req)
@@ -870,7 +870,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?status=deleted',
+        req = fakes.HTTPRequest.blank('/fake/servers?status=deleted',
                                       use_admin_context=True)
 
         servers = self.controller.detail(req)['servers']
@@ -890,7 +890,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?name=whee.*')
+        req = fakes.HTTPRequest.blank('/fake/servers?name=whee.*')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -913,7 +913,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
         params = 'changes-since=2011-01-24T17:08:01Z'
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?%s' % params)
+        req = fakes.HTTPRequest.blank('/fake/servers?%s' % params)
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -921,7 +921,7 @@ class ServersControllerTest(test.TestCase):
 
     def test_get_servers_allows_changes_since_bad_value(self):
         params = 'changes-since=asdf'
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?%s' % params)
+        req = fakes.HTTPRequest.blank('/fake/servers?%s' % params)
         self.assertRaises(webob.exc.HTTPBadRequest, self.controller.index, req)
 
     def test_get_servers_admin_filters_as_user(self):
@@ -947,7 +947,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
         query_str = "name=foo&ip=10.*&status=active&unknown_option=meow"
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?%s' % query_str)
+        req = fakes.HTTPRequest.blank('/fake/servers?%s' % query_str)
         res = self.controller.index(req)
 
         servers = res['servers']
@@ -976,7 +976,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
         query_str = "name=foo&ip=10.*&status=active&unknown_option=meow"
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?%s' % query_str,
+        req = fakes.HTTPRequest.blank('/fake/servers?%s' % query_str,
                                       use_admin_context=True)
         servers = self.controller.index(req)['servers']
 
@@ -997,7 +997,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?ip=10\..*')
+        req = fakes.HTTPRequest.blank('/fake/servers?ip=10\..*')
         servers = self.controller.index(req)['servers']
 
         self.assertEqual(len(servers), 1)
@@ -1019,7 +1019,7 @@ class ServersControllerTest(test.TestCase):
 
         self.stubs.Set(compute_api.API, 'get_all', fake_get_all)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers?ip6=ffff.*',
+        req = fakes.HTTPRequest.blank('/fake/servers?ip6=ffff.*',
                                       use_admin_context=True)
         servers = self.controller.index(req)['servers']
 
@@ -1031,7 +1031,7 @@ class ServersControllerTest(test.TestCase):
                 fakes.fake_instance_get(name='server_test',
                                         access_ipv4='0.0.0.0',
                                         access_ipv6='beef::0123'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {
@@ -1048,7 +1048,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(res_dict['server']['accessIPv6'], 'beef::0123')
 
     def test_update_server_invalid_xml_raises_lookup(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/xml'
         #xml request which raises LookupError
@@ -1060,7 +1060,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(res.status_int, 400)
 
     def test_update_server_invalid_xml_raises_expat(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/xml'
         #xml request which raises ExpatError
@@ -1074,7 +1074,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_name(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(name='server_test'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'name': 'server_test'}}
@@ -1087,7 +1087,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_name_too_long(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(name='server_test'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'name': 'x' * 256}}
@@ -1109,7 +1109,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv4(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv4': '0.0.0.0'}}
@@ -1122,7 +1122,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv4_bad_format(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv4': 'bad_format'}}
@@ -1133,7 +1133,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv4_none(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv4': None}}
@@ -1146,7 +1146,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv4_blank(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv4='0.0.0.0'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv4': ''}}
@@ -1159,7 +1159,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv6(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv6='beef::0123'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv6': 'beef::0123'}}
@@ -1172,7 +1172,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv6_bad_format(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv6='beef::0123'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv6': 'bad_format'}}
@@ -1183,7 +1183,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv6_none(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv6='beef::0123'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv6': None}}
@@ -1196,7 +1196,7 @@ class ServersControllerTest(test.TestCase):
     def test_update_server_access_ipv6_blank(self):
         self.stubs.Set(db, 'instance_get',
                 fakes.fake_instance_get(access_ipv6='beef::0123'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'accessIPv6': ''}}
@@ -1207,7 +1207,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(res_dict['server']['accessIPv6'], '')
 
     def test_update_server_personality(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {
@@ -1237,7 +1237,7 @@ class ServersControllerTest(test.TestCase):
         #        self.stubs.Set(db, 'instance_get',
         #                return_server_with_attributes(name='server_test'))
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = "application/json"
         req.body = jsonutils.dumps(body)
@@ -1251,7 +1251,7 @@ class ServersControllerTest(test.TestCase):
             raise exception.InstanceNotFound(instance_id='fake')
 
         self.stubs.Set(compute_api.API, 'get', fake_get)
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'name': 'server_test'}}
@@ -1264,7 +1264,7 @@ class ServersControllerTest(test.TestCase):
             raise exception.InstanceNotFound(instance_id='fake')
 
         self.stubs.Set(compute_api.API, 'update', fake_update)
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
         req.content_type = 'application/json'
         body = {'server': {'name': 'server_test'}}
@@ -1299,7 +1299,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1333,7 +1333,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1367,7 +1367,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1401,7 +1401,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1429,7 +1429,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1457,7 +1457,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1486,7 +1486,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1512,7 +1512,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1546,7 +1546,7 @@ class ServersControllerTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/a/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/a/action')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1572,7 +1572,7 @@ class ServersControllerTest(test.TestCase):
                 },
             ],
         }
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail')
+        req = fakes.HTTPRequest.blank('/fake/servers/detail')
         res_dict = self.controller.detail(req)
 
         for i, s in enumerate(res_dict['servers']):
@@ -1600,7 +1600,7 @@ class ServersControllerTest(test.TestCase):
         self.stubs.Set(db, 'instance_get_all_by_filters',
                 return_servers_with_host)
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/detail')
+        req = fakes.HTTPRequest.blank('/fake/servers/detail')
         res_dict = self.controller.detail(req)
 
         server_list = res_dict['servers']
@@ -1615,7 +1615,7 @@ class ServersControllerTest(test.TestCase):
 
     def _delete_server_instance(self, uuid=FAKE_UUID):
         fakes.stub_out_instance_quota(self.stubs, 0, 10)
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % uuid)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % uuid)
         req.method = 'DELETE'
 
         self.server_delete_called = False
@@ -1640,7 +1640,7 @@ class ServersControllerTest(test.TestCase):
 
     def test_delete_server_instance_while_building(self):
         fakes.stub_out_instance_quota(self.stubs, 0, 10)
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'DELETE'
 
         self.server_delete_called = False
@@ -1654,7 +1654,7 @@ class ServersControllerTest(test.TestCase):
         self.assertEqual(self.server_delete_called, True)
 
     def test_delete_server_instance_while_resize(self):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'DELETE'
 
         self.server_delete_called = False
@@ -1688,7 +1688,7 @@ class ServerStatusTest(test.TestCase):
                 fakes.fake_instance_get(vm_state=vm_state,
                                         task_state=task_state))
 
-        request = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        request = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         return self.controller.show(request, FAKE_UUID)
 
     def test_active(self):
@@ -1714,7 +1714,7 @@ class ServerStatusTest(test.TestCase):
         rule = {'compute:reboot':
                 common_policy.parse_rule('role:admin')}
         common_policy.set_rules(common_policy.Rules(rule))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/1234/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/1234/action')
         self.assertRaises(exception.PolicyNotAuthorized,
                 self.controller._action_reboot, req, '1234',
                 {'reboot': {'type': 'HARD'}})
@@ -1742,7 +1742,7 @@ class ServerStatusTest(test.TestCase):
         rule = {'compute:confirm_resize':
                 common_policy.parse_rule('role:admin')}
         common_policy.set_rules(common_policy.Rules(rule))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/1234/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/1234/action')
         self.assertRaises(exception.PolicyNotAuthorized,
                 self.controller._action_confirm_resize, req, '1234', {})
 
@@ -1764,7 +1764,7 @@ class ServerStatusTest(test.TestCase):
         rule = {'compute:revert_resize':
                 common_policy.parse_rule('role:admin')}
         common_policy.set_rules(common_policy.Rules(rule))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/1234/action')
+        req = fakes.HTTPRequest.blank('/fake/servers/1234/action')
         self.assertRaises(exception.PolicyNotAuthorized,
                 self.controller._action_revert_resize, req, '1234', {})
 
@@ -1900,7 +1900,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_uuid, flavorRef=2,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1921,7 +1921,7 @@ class ServersControllerCreateTest(test.TestCase):
                 'flavorRef': flavor_ref,
             }
         }
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1942,7 +1942,7 @@ class ServersControllerCreateTest(test.TestCase):
             'networks': {'uuid': '76fa36fc-c930-4bf3-8c8a-ea2a2420deb6'},
             }
         }
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -1960,7 +1960,7 @@ class ServersControllerCreateTest(test.TestCase):
         self.addCleanup(image_service.update, context, image_uuid,
                         {'status': 'active'})
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         body = dict(server=dict(
             name='server_test', imageRef=image_uuid, flavorRef=2,
@@ -1990,7 +1990,7 @@ class ServersControllerCreateTest(test.TestCase):
         self.addCleanup(image_service.update, context, image_uuid,
                         {'size': orig_size})
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         body = dict(server=dict(name='server_test',
                                 imageRef=image_uuid,
@@ -2016,7 +2016,7 @@ class ServersControllerCreateTest(test.TestCase):
                 'flavorRef': flavor_ref,
             }
         }
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2038,7 +2038,7 @@ class ServersControllerCreateTest(test.TestCase):
                 'flavorRef': flavor_ref,
             }
         }
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2060,7 +2060,7 @@ class ServersControllerCreateTest(test.TestCase):
                 'flavorRef': flavor_ref,
             }
         }
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2082,7 +2082,7 @@ class ServersControllerCreateTest(test.TestCase):
                 'flavorRef': flavor_ref,
             }
         }
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2110,7 +2110,7 @@ class ServersControllerCreateTest(test.TestCase):
             }
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2139,7 +2139,7 @@ class ServersControllerCreateTest(test.TestCase):
             }
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2168,7 +2168,7 @@ class ServersControllerCreateTest(test.TestCase):
             }
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2244,7 +2244,7 @@ class ServersControllerCreateTest(test.TestCase):
             }
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2267,7 +2267,7 @@ class ServersControllerCreateTest(test.TestCase):
             }
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2286,7 +2286,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2307,7 +2307,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2325,7 +2325,7 @@ class ServersControllerCreateTest(test.TestCase):
             server.pop('imageRef', None)
         server.update(params)
         body = dict(server=server)
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2805,7 +2805,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2845,7 +2845,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2882,7 +2882,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2916,7 +2916,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -2947,7 +2947,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3009,7 +3009,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3044,7 +3044,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3072,7 +3072,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3096,7 +3096,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3120,7 +3120,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3144,7 +3144,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3158,7 +3158,7 @@ class ServersControllerCreateTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             key_name='nonexistentkey'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3172,7 +3172,7 @@ class ServersControllerCreateTest(test.TestCase):
         body = dict(server=dict(
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             key_name='key'))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3188,7 +3188,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3203,7 +3203,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3218,7 +3218,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3244,7 +3244,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3271,7 +3271,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3298,7 +3298,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3323,7 +3323,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3351,7 +3351,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_href, flavorRef=flavor_ref,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3370,7 +3370,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3390,7 +3390,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers['content-type'] = "application/json"
@@ -3411,7 +3411,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers['content-type'] = "application/json"
@@ -3432,7 +3432,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers['content-type'] = "application/json"
@@ -3470,7 +3470,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -3501,7 +3501,7 @@ class ServersControllerCreateTest(test.TestCase):
             },
         }
 
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers['content-type'] = 'application/json'
@@ -3517,7 +3517,7 @@ class ServersControllerCreateTest(test.TestCase):
             name='server_test', imageRef=image_uuid, flavorRef=3,
             metadata={'hello': 'world', 'open': 'stack'},
             personality={}))
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
         req.body = jsonutils.dumps(body)
         req.headers["content-type"] = "application/json"
@@ -4285,7 +4285,7 @@ class ServersViewBuilderTest(test.TestCase):
 
         self.uuid = self.instance['uuid']
         self.view_builder = views.servers.ViewBuilder()
-        self.request = fakes.HTTPRequest.blank("/v2")
+        self.request = fakes.HTTPRequest.blank("/v2/fake")
 
     def test_get_flavor_valid_flavor(self):
         flavor_bookmark = "http://localhost/fake/flavors/1"
@@ -5808,7 +5808,7 @@ class ServersUnprocessableEntityTestCase(test.TestCase):
         self.controller = servers.Controller(self.ext_mgr)
 
     def _unprocessable_server_create(self, body):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers')
+        req = fakes.HTTPRequest.blank('/fake/servers')
         req.method = 'POST'
 
         self.assertRaises(webob.exc.HTTPUnprocessableEntity,
@@ -5826,7 +5826,7 @@ class ServersUnprocessableEntityTestCase(test.TestCase):
         self._unprocessable_server_create(body=body)
 
     def _unprocessable_server_update(self, body):
-        req = fakes.HTTPRequest.blank('/v2/fake/servers/%s' % FAKE_UUID)
+        req = fakes.HTTPRequest.blank('/fake/servers/%s' % FAKE_UUID)
         req.method = 'PUT'
 
         self.assertRaises(webob.exc.HTTPUnprocessableEntity,
diff --git a/nova/tests/api/openstack/compute/test_v3_extensions.py b/nova/tests/api/openstack/compute/test_v3_extensions.py
index 97429ca45..ec472f38a 100644
--- a/nova/tests/api/openstack/compute/test_v3_extensions.py
+++ b/nova/tests/api/openstack/compute/test_v3_extensions.py
@@ -16,10 +16,12 @@
 
 from oslo.config import cfg
 import stevedore
+import webob.exc
 
 from nova.api import openstack
 from nova.api.openstack import compute
 from nova.api.openstack.compute import plugins
+from nova.api.openstack import extensions
 from nova import exception
 from nova import test
 
@@ -139,3 +141,38 @@ class ExtensionLoadingTestCase(test.TestCase):
         self.stubs.Set(plugins, 'LoadedExtensionInfo',
                        fake_loaded_extension_info)
         self.assertRaises(exception.CoreAPIMissing, compute.APIRouterV3)
+
+    def test_extensions_expected_error(self):
+        @extensions.expected_errors(404)
+        def fake_func():
+            raise webob.exc.HTTPNotFound()
+
+        self.assertRaises(webob.exc.HTTPNotFound, fake_func)
+
+    def test_extensions_expected_error_from_list(self):
+        @extensions.expected_errors((404, 403))
+        def fake_func():
+            raise webob.exc.HTTPNotFound()
+
+        self.assertRaises(webob.exc.HTTPNotFound, fake_func)
+
+    def test_extensions_unexpected_error(self):
+        @extensions.expected_errors(404)
+        def fake_func():
+            raise webob.exc.HTTPConflict()
+
+        self.assertRaises(webob.exc.HTTPInternalServerError, fake_func)
+
+    def test_extensions_unexpected_error_from_list(self):
+        @extensions.expected_errors((404, 413))
+        def fake_func():
+            raise webob.exc.HTTPConflict()
+
+        self.assertRaises(webob.exc.HTTPInternalServerError, fake_func)
+
+    def test_extensions_unexpected_policy_not_authorized_error(self):
+        @extensions.expected_errors(404)
+        def fake_func():
+            raise exception.PolicyNotAuthorized(action="foo")
+
+        self.assertRaises(exception.PolicyNotAuthorized, fake_func)
diff --git a/nova/tests/api/openstack/fakes.py b/nova/tests/api/openstack/fakes.py
index f05561ff2..6c30b9a9e 100644
--- a/nova/tests/api/openstack/fakes.py
+++ b/nova/tests/api/openstack/fakes.py
@@ -419,7 +419,7 @@ def get_fake_uuid(token=0):
 
 
 def fake_instance_get(**kwargs):
-    def _return_server(context, uuid):
+    def _return_server(context, uuid, columns_to_join=None):
         return stub_instance(1, **kwargs)
     return _return_server
 
@@ -435,6 +435,8 @@ def fake_instance_get_all_by_filters(num_servers=5, **kwargs):
         if "limit" in kwargs:
             limit = kwargs["limit"]
 
+        if 'columns_to_join' in kwargs:
+            kwargs.pop('columns_to_join')
         for i in xrange(num_servers):
             uuid = get_fake_uuid(i)
             server = stub_instance(id=i + 1, uuid=uuid,
@@ -488,7 +490,10 @@ def stub_instance(id, user_id=None, project_id=None, host=None,
         key_data = ''
 
     if security_groups is None:
-        security_groups = [{"id": 1, "name": "test"}]
+        security_groups = [{"id": 1, "name": "test", "description": "Foo:",
+                            "project_id": "project", "user_id": "user",
+                            "created_at": None, "updated_at": None,
+                            "deleted_at": None, "deleted": False}]
 
     # ReservationID isn't sent back, hack it in there.
     server_name = name or "server%s" % id
@@ -501,6 +506,8 @@ def stub_instance(id, user_id=None, project_id=None, host=None,
         "id": int(id),
         "created_at": datetime.datetime(2010, 10, 10, 12, 0, 0),
         "updated_at": datetime.datetime(2010, 11, 11, 11, 0, 0),
+        "deleted_at": datetime.datetime(2010, 12, 12, 10, 0, 0),
+        "deleted": None,
         "user_id": user_id,
         "project_id": project_id,
         "image_ref": image_ref,
@@ -553,6 +560,7 @@ def stub_instance(id, user_id=None, project_id=None, host=None,
         "os_type": ""}
 
     instance.update(info_cache)
+    instance['info_cache']['instance_uuid'] = instance['uuid']
 
     return instance
 
diff --git a/nova/tests/cells/test_cells_manager.py b/nova/tests/cells/test_cells_manager.py
index 4e35cd818..89a60cb35 100644
--- a/nova/tests/cells/test_cells_manager.py
+++ b/nova/tests/cells/test_cells_manager.py
@@ -548,3 +548,27 @@ class CellsManagerClassTestCase(test.TestCase):
                 instance_uuid=instance_uuid, console_port=console_port,
                 console_type=console_type)
         self.assertEqual('fake-response', response)
+
+    def test_bdm_update_or_create_at_top(self):
+        self.mox.StubOutWithMock(self.msg_runner,
+                                 'bdm_update_or_create_at_top')
+        self.msg_runner.bdm_update_or_create_at_top(self.ctxt,
+                                                    'fake-bdm',
+                                                    create='foo')
+        self.mox.ReplayAll()
+        self.cells_manager.bdm_update_or_create_at_top(self.ctxt,
+                                                       'fake-bdm',
+                                                       create='foo')
+
+    def test_bdm_destroy_at_top(self):
+        self.mox.StubOutWithMock(self.msg_runner, 'bdm_destroy_at_top')
+        self.msg_runner.bdm_destroy_at_top(self.ctxt,
+                                           'fake_instance_uuid',
+                                           device_name='fake_device_name',
+                                           volume_id='fake_volume_id')
+
+        self.mox.ReplayAll()
+        self.cells_manager.bdm_destroy_at_top(self.ctxt,
+                                              'fake_instance_uuid',
+                                              device_name='fake_device_name',
+                                              volume_id='fake_volume_id')
diff --git a/nova/tests/cells/test_cells_messaging.py b/nova/tests/cells/test_cells_messaging.py
index d4d9b052e..734fecf0e 100644
--- a/nova/tests/cells/test_cells_messaging.py
+++ b/nova/tests/cells/test_cells_messaging.py
@@ -23,6 +23,7 @@ from nova.compute import vm_states
 from nova import context
 from nova import db
 from nova import exception
+from nova.objects import instance as instance_obj
 from nova.openstack.common import rpc
 from nova.openstack.common import timeutils
 from nova import test
@@ -641,6 +642,60 @@ class CellsTargetedMethodsTestCase(test.TestCase):
         result = response.value_or_raise()
         self.assertEqual('fake_result', result)
 
+    def test_run_compute_api_method_expects_obj(self):
+        instance_uuid = 'fake_instance_uuid'
+        method_info = {'method': 'start',
+                       'method_args': (instance_uuid, 2, 3),
+                       'method_kwargs': {'arg1': 'val1', 'arg2': 'val2'}}
+        self.mox.StubOutWithMock(self.tgt_compute_api, 'start')
+        self.mox.StubOutWithMock(self.tgt_db_inst, 'instance_get_by_uuid')
+
+        self.tgt_db_inst.instance_get_by_uuid(self.ctxt,
+                instance_uuid).AndReturn('fake_instance')
+
+        def get_instance_mock():
+            # NOTE(comstud): This block of code simulates the following
+            # mox code:
+            #
+            # self.mox.StubOutWithMock(instance_obj, 'Instance',
+            #                          use_mock_anything=True)
+            # self.mox.StubOutWithMock(instance_obj.Instance,
+            #                          '_from_db_object')
+            # instance_mock = self.mox.CreateMock(instance_obj.Instance)
+            # instance_obj.Instance().AndReturn(instance_mock)
+            #
+            # Unfortunately, the above code fails on py27 do to some
+            # issue with the Mock object do to similar issue as this:
+            # https://code.google.com/p/pymox/issues/detail?id=35
+            #
+            class FakeInstance(object):
+                def _from_db_object(obj, db_obj):
+                    pass
+
+            instance_mock = FakeInstance()
+
+            def fake_instance():
+                return instance_mock
+
+            self.stubs.Set(instance_obj, 'Instance', fake_instance)
+            self.mox.StubOutWithMock(instance_mock, '_from_db_object')
+            return instance_mock
+
+        instance = get_instance_mock()
+        instance._from_db_object(
+                instance, 'fake_instance').AndReturn(instance)
+        self.tgt_compute_api.start(self.ctxt, instance, 2, 3,
+                arg1='val1', arg2='val2').AndReturn('fake_result')
+        self.mox.ReplayAll()
+
+        response = self.src_msg_runner.run_compute_api_method(
+                self.ctxt,
+                self.tgt_cell_name,
+                method_info,
+                True)
+        result = response.value_or_raise()
+        self.assertEqual('fake_result', result)
+
     def test_run_compute_api_method_unknown_instance(self):
         # Unknown instance should send a broadcast up that instance
         # is gone.
@@ -1426,3 +1481,173 @@ class CellsBroadcastMethodsTestCase(test.TestCase):
         self.mox.ReplayAll()
 
         self.src_msg_runner.consoleauth_delete_tokens(self.ctxt, fake_uuid)
+
+    def test_bdm_update_or_create_with_none_create(self):
+        fake_bdm = {'id': 'fake_id',
+                    'volume_id': 'fake_volume_id'}
+        expected_bdm = fake_bdm.copy()
+        expected_bdm.pop('id')
+
+        # Shouldn't be called for these 2 cells
+        self.mox.StubOutWithMock(self.src_db_inst,
+                'block_device_mapping_update_or_create')
+        self.mox.StubOutWithMock(self.mid_db_inst,
+                'block_device_mapping_update_or_create')
+
+        self.mox.StubOutWithMock(self.tgt_db_inst,
+                'block_device_mapping_update_or_create')
+        self.tgt_db_inst.block_device_mapping_update_or_create(
+                self.ctxt, expected_bdm, legacy=False)
+
+        self.mox.ReplayAll()
+
+        self.src_msg_runner.bdm_update_or_create_at_top(self.ctxt,
+                                                        fake_bdm,
+                                                        create=None)
+
+    def test_bdm_update_or_create_with_true_create(self):
+        fake_bdm = {'id': 'fake_id',
+                    'volume_id': 'fake_volume_id'}
+        expected_bdm = fake_bdm.copy()
+        expected_bdm.pop('id')
+
+        # Shouldn't be called for these 2 cells
+        self.mox.StubOutWithMock(self.src_db_inst,
+                'block_device_mapping_create')
+        self.mox.StubOutWithMock(self.mid_db_inst,
+                'block_device_mapping_create')
+
+        self.mox.StubOutWithMock(self.tgt_db_inst,
+                'block_device_mapping_create')
+        self.tgt_db_inst.block_device_mapping_create(
+                self.ctxt, fake_bdm, legacy=False)
+
+        self.mox.ReplayAll()
+
+        self.src_msg_runner.bdm_update_or_create_at_top(self.ctxt,
+                                                        fake_bdm,
+                                                        create=True)
+
+    def test_bdm_update_or_create_with_false_create_vol_id(self):
+        fake_bdm = {'id': 'fake_id',
+                    'instance_uuid': 'fake_instance_uuid',
+                    'device_name': 'fake_device_name',
+                    'volume_id': 'fake_volume_id'}
+        expected_bdm = fake_bdm.copy()
+        expected_bdm.pop('id')
+
+        fake_inst_bdms = [{'id': 1,
+                           'volume_id': 'not-a-match',
+                           'device_name': 'not-a-match'},
+                          {'id': 2,
+                           'volume_id': 'fake_volume_id',
+                           'device_name': 'not-a-match'},
+                          {'id': 3,
+                           'volume_id': 'not-a-match',
+                           'device_name': 'not-a-match'}]
+
+        # Shouldn't be called for these 2 cells
+        self.mox.StubOutWithMock(self.src_db_inst,
+                'block_device_mapping_update')
+        self.mox.StubOutWithMock(self.mid_db_inst,
+                'block_device_mapping_update')
+
+        self.mox.StubOutWithMock(self.tgt_db_inst,
+                'block_device_mapping_get_all_by_instance')
+        self.mox.StubOutWithMock(self.tgt_db_inst,
+                'block_device_mapping_update')
+
+        self.tgt_db_inst.block_device_mapping_get_all_by_instance(
+                self.ctxt, 'fake_instance_uuid').AndReturn(
+                        fake_inst_bdms)
+        # Should try to update ID 2.
+        self.tgt_db_inst.block_device_mapping_update(
+                self.ctxt, 2, expected_bdm, legacy=False)
+
+        self.mox.ReplayAll()
+
+        self.src_msg_runner.bdm_update_or_create_at_top(self.ctxt,
+                                                        fake_bdm,
+                                                        create=False)
+
+    def test_bdm_update_or_create_with_false_create_dev_name(self):
+        fake_bdm = {'id': 'fake_id',
+                    'instance_uuid': 'fake_instance_uuid',
+                    'device_name': 'fake_device_name',
+                    'volume_id': 'fake_volume_id'}
+        expected_bdm = fake_bdm.copy()
+        expected_bdm.pop('id')
+
+        fake_inst_bdms = [{'id': 1,
+                           'volume_id': 'not-a-match',
+                           'device_name': 'not-a-match'},
+                          {'id': 2,
+                           'volume_id': 'not-a-match',
+                           'device_name': 'fake_device_name'},
+                          {'id': 3,
+                           'volume_id': 'not-a-match',
+                           'device_name': 'not-a-match'}]
+
+        # Shouldn't be called for these 2 cells
+        self.mox.StubOutWithMock(self.src_db_inst,
+                'block_device_mapping_update')
+        self.mox.StubOutWithMock(self.mid_db_inst,
+                'block_device_mapping_update')
+
+        self.mox.StubOutWithMock(self.tgt_db_inst,
+                'block_device_mapping_get_all_by_instance')
+        self.mox.StubOutWithMock(self.tgt_db_inst,
+                'block_device_mapping_update')
+
+        self.tgt_db_inst.block_device_mapping_get_all_by_instance(
+                self.ctxt, 'fake_instance_uuid').AndReturn(
+                        fake_inst_bdms)
+        # Should try to update ID 2.
+        self.tgt_db_inst.block_device_mapping_update(
+                self.ctxt, 2, expected_bdm, legacy=False)
+
+        self.mox.ReplayAll()
+
+        self.src_msg_runner.bdm_update_or_create_at_top(self.ctxt,
+                                                        fake_bdm,
+                                                        create=False)
+
+    def test_bdm_destroy_by_volume(self):
+        fake_instance_uuid = 'fake-instance-uuid'
+        fake_volume_id = 'fake-volume-name'
+
+        # Shouldn't be called for these 2 cells
+        self.mox.StubOutWithMock(self.src_db_inst,
+                'block_device_mapping_destroy_by_instance_and_volume')
+        self.mox.StubOutWithMock(self.mid_db_inst,
+                'block_device_mapping_destroy_by_instance_and_volume')
+
+        self.mox.StubOutWithMock(self.tgt_db_inst,
+                'block_device_mapping_destroy_by_instance_and_volume')
+        self.tgt_db_inst.block_device_mapping_destroy_by_instance_and_volume(
+                self.ctxt, fake_instance_uuid, fake_volume_id)
+
+        self.mox.ReplayAll()
+
+        self.src_msg_runner.bdm_destroy_at_top(self.ctxt, fake_instance_uuid,
+                                               volume_id=fake_volume_id)
+
+    def test_bdm_destroy_by_device(self):
+        fake_instance_uuid = 'fake-instance-uuid'
+        fake_device_name = 'fake-device-name'
+
+        # Shouldn't be called for these 2 cells
+        self.mox.StubOutWithMock(self.src_db_inst,
+                'block_device_mapping_destroy_by_instance_and_device')
+        self.mox.StubOutWithMock(self.mid_db_inst,
+                'block_device_mapping_destroy_by_instance_and_device')
+
+        self.mox.StubOutWithMock(self.tgt_db_inst,
+                'block_device_mapping_destroy_by_instance_and_device')
+        self.tgt_db_inst.block_device_mapping_destroy_by_instance_and_device(
+                self.ctxt, fake_instance_uuid, fake_device_name)
+
+        self.mox.ReplayAll()
+
+        self.src_msg_runner.bdm_destroy_at_top(self.ctxt, fake_instance_uuid,
+                                               device_name=fake_device_name)
diff --git a/nova/tests/cells/test_cells_rpcapi.py b/nova/tests/cells/test_cells_rpcapi.py
index 4d58bdb9e..6eeff1730 100644
--- a/nova/tests/cells/test_cells_rpcapi.py
+++ b/nova/tests/cells/test_cells_rpcapi.py
@@ -425,3 +425,29 @@ class CellsAPITestCase(test.TestCase):
         self._check_result(call_info, 'validate_console_port',
                 expected_args, version='1.6')
         self.assertEqual(result, 'fake_response')
+
+    def test_bdm_update_or_create_at_top(self):
+        fake_bdm = {'id': 2, 'other': 'meow'}
+
+        call_info = self._stub_rpc_method('cast', None)
+
+        self.cells_rpcapi.bdm_update_or_create_at_top(
+                self.fake_context, fake_bdm, create='fake-create')
+
+        expected_args = {'bdm': fake_bdm, 'create': 'fake-create'}
+        self._check_result(call_info, 'bdm_update_or_create_at_top',
+                expected_args, version='1.10')
+
+    def test_bdm_destroy_at_top(self):
+        call_info = self._stub_rpc_method('cast', None)
+
+        self.cells_rpcapi.bdm_destroy_at_top(self.fake_context,
+                                             'fake-uuid',
+                                             device_name='fake-device',
+                                             volume_id='fake-vol')
+
+        expected_args = {'instance_uuid': 'fake-uuid',
+                         'device_name': 'fake-device',
+                         'volume_id': 'fake-vol'}
+        self._check_result(call_info, 'bdm_destroy_at_top',
+                expected_args, version='1.10')
diff --git a/nova/tests/cells/test_cells_scheduler.py b/nova/tests/cells/test_cells_scheduler.py
index 600867f43..46be492cc 100644
--- a/nova/tests/cells/test_cells_scheduler.py
+++ b/nova/tests/cells/test_cells_scheduler.py
@@ -84,10 +84,9 @@ class CellsSchedulerTestCase(test.TestCase):
                 'block_device_mapping': 'fake_bdm'}
         self.build_inst_kwargs = {
                 'instances': self.instances,
-                'instance_type': 'fake_type',
                 'image': 'fake_image',
-                'filter_properties': {},
-                'security_group': 'fake_sec_groups',
+                'filter_properties': {'instance_type': 'fake_type'},
+                'security_groups': 'fake_sec_groups',
                 'block_device_mapping': 'fake_bdm'}
 
     def test_create_instances_here(self):
@@ -284,10 +283,11 @@ class CellsSchedulerTestCase(test.TestCase):
         self.assertEqual(self.instance_uuids, call_info['instance_uuids'])
         self.assertEqual(self.build_inst_kwargs['instances'][0],
                 call_info['instance_properties'])
-        self.assertEqual(self.build_inst_kwargs['instance_type'],
-                call_info['instance_type'])
+        self.assertEqual(
+            self.build_inst_kwargs['filter_properties']['instance_type'],
+            call_info['instance_type'])
         self.assertEqual(self.build_inst_kwargs['image'], call_info['image'])
-        self.assertEqual(self.build_inst_kwargs['security_group'],
+        self.assertEqual(self.build_inst_kwargs['security_groups'],
                 call_info['security_groups'])
         self.assertEqual(self.build_inst_kwargs['block_device_mapping'],
                 call_info['block_device_mapping'])
diff --git a/nova/tests/compute/test_compute.py b/nova/tests/compute/test_compute.py
index c887041f8..e2783641c 100644
--- a/nova/tests/compute/test_compute.py
+++ b/nova/tests/compute/test_compute.py
@@ -262,6 +262,7 @@ class BaseTestCase(test.TestCase):
         inst['created_at'] = timeutils.utcnow()
         inst['updated_at'] = timeutils.utcnow()
         inst['launched_at'] = timeutils.utcnow()
+        inst['security_groups'] = []
         inst.update(params)
         _create_service_entries(self.context.elevated(),
                 {'fake_zone': [inst['host']]})
@@ -275,7 +276,10 @@ class BaseTestCase(test.TestCase):
 
         def _fake_db_create(_ctxt, inst):
             for k, v in inst.items():
-                setattr(instance, k, v)
+                if k == 'security_groups':
+                    setattr(instance, k, v or None)
+                else:
+                    setattr(instance, k, v)
             return instance
 
         self.stubs.Set(db, 'instance_create', _fake_db_create)
@@ -1217,6 +1221,30 @@ class ComputeTestCase(BaseTestCase):
         LOG.info(_("After terminating instances: %s"), instances)
         self.assertEqual(len(instances), 0)
 
+    def test_terminate_no_fixed_ips(self):
+        # This is as reported in LP bug 1192893
+        instance = jsonutils.to_primitive(self._create_fake_instance())
+
+        self.compute.run_instance(self.context, instance=instance)
+
+        instances = db.instance_get_all(self.context)
+        LOG.info(_("Running instances: %s"), instances)
+        self.assertEqual(len(instances), 1)
+
+        self.mox.StubOutWithMock(self.compute, '_get_instance_nw_info')
+        self.compute._get_instance_nw_info(
+                mox.IgnoreArg(),
+                mox.IgnoreArg()).AndRaise(
+                    exception.NoMoreFixedIps()
+                )
+        self.mox.ReplayAll()
+
+        self.compute.terminate_instance(self.context, instance=instance)
+
+        instances = db.instance_get_all(self.context)
+        LOG.info(_("After terminating instances: %s"), instances)
+        self.assertEqual(len(instances), 0)
+
     def test_terminate_failure_leaves_task_state(self):
         """Ensure that a failure in terminate_instance does not result
         in the task state being reverted from DELETING (see LP 1046236).
@@ -1403,7 +1431,8 @@ class ComputeTestCase(BaseTestCase):
 
         called = {'power_on': False}
 
-        def fake_driver_power_on(self, instance):
+        def fake_driver_power_on(self, context, instance, network_info,
+                                 block_device_info):
             called['power_on'] = True
 
         self.stubs.Set(nova.virt.fake.FakeDriver, 'power_on',
@@ -4827,7 +4856,8 @@ class ComputeTestCase(BaseTestCase):
         inst = dict(fakes.stub_instance(1),
                     deleted_at=None, created_at=None, updated_at=None,
                     deleted=0, info_cache={'instance_uuid': 'fake-uuid',
-                                           'network_info': None})
+                                           'network_info': None},
+                    security_groups=None)
         startup_instances = [inst, inst, inst]
 
         def _do_mock_calls(defer_iptables_apply):
diff --git a/nova/tests/conductor/tasks/__init__.py b/nova/tests/conductor/tasks/__init__.py
new file mode 100644
index 000000000..94e731d20
--- /dev/null
+++ b/nova/tests/conductor/tasks/__init__.py
@@ -0,0 +1,11 @@
+#    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.
diff --git a/nova/tests/conductor/tasks/test_live_migrate.py b/nova/tests/conductor/tasks/test_live_migrate.py
new file mode 100644
index 000000000..c54e53b1a
--- /dev/null
+++ b/nova/tests/conductor/tasks/test_live_migrate.py
@@ -0,0 +1,311 @@
+# vim: tabstop=4 shiftwidth=4 softtabstop=4
+
+#    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.
+
+from nova.compute import flavors
+from nova.compute import power_state
+from nova.conductor.tasks import live_migrate
+from nova import db
+from nova import exception
+from nova import test
+
+
+class LiveMigrationTaskTestCase(test.TestCase):
+    def setUp(self):
+        super(LiveMigrationTaskTestCase, self).setUp()
+        self.context = "context"
+        self.instance_host = "host"
+        self.instance_uuid = "uuid"
+        self.instance_image = "image_ref"
+        self.instance = {
+            "host": self.instance_host,
+            "uuid": self.instance_uuid,
+            "power_state": power_state.RUNNING,
+            "memory_mb": 512,
+            "image_ref": self.instance_image}
+        self.destination = "destination"
+        self.block_migration = "bm"
+        self.disk_over_commit = "doc"
+        self.select_hosts_callback = self._select_hosts_callback
+        self._generate_task()
+
+    def _generate_task(self):
+        self.task = live_migrate.LiveMigrationTask(self.context,
+            self.instance, self.destination, self.block_migration,
+            self.disk_over_commit, self.select_hosts_callback)
+
+    def _select_hosts_callback(self, *args):
+        return ["host1"]
+
+    def test_execute_with_destination(self):
+        self.mox.StubOutWithMock(self.task, '_check_host_is_up')
+        self.mox.StubOutWithMock(self.task, '_check_requested_destination')
+        self.mox.StubOutWithMock(self.task.compute_rpcapi, 'live_migration')
+
+        self.task._check_host_is_up(self.instance_host)
+        self.task._check_requested_destination()
+        self.task.compute_rpcapi.live_migration(self.context,
+                host=self.instance_host,
+                instance=self.instance,
+                dest=self.destination,
+                block_migration=self.block_migration,
+                migrate_data=None).AndReturn("bob")
+
+        self.mox.ReplayAll()
+        self.assertEqual("bob", self.task.execute())
+
+    def test_execute_without_destination(self):
+        self.destination = None
+        self._generate_task()
+        self.assertEqual(None, self.task.destination)
+
+        self.mox.StubOutWithMock(self.task, '_check_host_is_up')
+        self.mox.StubOutWithMock(self.task, '_find_destination')
+        self.mox.StubOutWithMock(self.task.compute_rpcapi, 'live_migration')
+
+        self.task._check_host_is_up(self.instance_host)
+        self.task._find_destination().AndReturn("found_host")
+        self.task.compute_rpcapi.live_migration(self.context,
+                host=self.instance_host,
+                instance=self.instance,
+                dest="found_host",
+                block_migration=self.block_migration,
+                migrate_data=None).AndReturn("bob")
+
+        self.mox.ReplayAll()
+        self.assertEqual("bob", self.task.execute())
+
+    def test_check_instance_is_running_passes(self):
+        self.task._check_instance_is_running()
+
+    def test_check_instance_is_running_fails_when_shutdown(self):
+        self.task.instance['power_state'] = power_state.SHUTDOWN
+        self.assertRaises(exception.InstanceNotRunning,
+                          self.task._check_instance_is_running)
+
+    def test_check_instance_host_is_up(self):
+        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
+        self.mox.StubOutWithMock(self.task.servicegroup_api, 'service_is_up')
+
+        db.service_get_by_compute_host(self.context,
+                                       "host").AndReturn("service")
+        self.task.servicegroup_api.service_is_up("service").AndReturn(True)
+
+        self.mox.ReplayAll()
+        self.task._check_host_is_up("host")
+
+    def test_check_instance_host_is_up_fails_if_not_up(self):
+        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
+        self.mox.StubOutWithMock(self.task.servicegroup_api, 'service_is_up')
+
+        db.service_get_by_compute_host(self.context,
+                                       "host").AndReturn("service")
+        self.task.servicegroup_api.service_is_up("service").AndReturn(False)
+
+        self.mox.ReplayAll()
+        self.assertRaises(exception.ComputeServiceUnavailable,
+                self.task._check_host_is_up, "host")
+
+    def test_check_instance_host_is_up_fails_if_not_found(self):
+        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
+
+        db.service_get_by_compute_host(self.context,
+                                       "host").AndRaise(exception.NotFound)
+
+        self.mox.ReplayAll()
+        self.assertRaises(exception.ComputeServiceUnavailable,
+            self.task._check_host_is_up, "host")
+
+    def test_check_requested_destination(self):
+        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
+        self.mox.StubOutWithMock(self.task, '_get_compute_info')
+        self.mox.StubOutWithMock(self.task.servicegroup_api, 'service_is_up')
+        self.mox.StubOutWithMock(self.task.compute_rpcapi,
+                                 'check_can_live_migrate_destination')
+
+        db.service_get_by_compute_host(self.context,
+                                       self.destination).AndReturn("service")
+        self.task.servicegroup_api.service_is_up("service").AndReturn(True)
+        hypervisor_details = {
+            "hypervisor_type": "a",
+            "hypervisor_version": 6.1,
+            "free_ram_mb": 513
+        }
+        self.task._get_compute_info(self.destination)\
+                .AndReturn(hypervisor_details)
+        self.task._get_compute_info(self.instance_host)\
+                .AndReturn(hypervisor_details)
+        self.task._get_compute_info(self.destination)\
+                .AndReturn(hypervisor_details)
+
+        self.task.compute_rpcapi.check_can_live_migrate_destination(
+                self.context, self.instance, self.destination,
+                self.block_migration, self.disk_over_commit).AndReturn(
+                        "migrate_data")
+
+        self.mox.ReplayAll()
+        self.task._check_requested_destination()
+        self.assertEqual("migrate_data", self.task.migrate_data)
+
+    def test_check_requested_destination_fails_with_same_dest(self):
+        self.task.destination = "same"
+        self.task.source = "same"
+        self.assertRaises(exception.UnableToMigrateToSelf,
+                          self.task._check_requested_destination)
+
+    def test_check_requested_destination_fails_when_destination_is_up(self):
+        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
+
+        db.service_get_by_compute_host(self.context,
+            self.destination).AndRaise(exception.NotFound)
+
+        self.mox.ReplayAll()
+        self.assertRaises(exception.ComputeServiceUnavailable,
+                          self.task._check_requested_destination)
+
+    def test_check_requested_destination_fails_with_not_enough_memory(self):
+        self.mox.StubOutWithMock(self.task, '_check_host_is_up')
+        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
+
+        self.task._check_host_is_up(self.destination)
+        db.service_get_by_compute_host(self.context,
+            self.destination).AndReturn({
+                "compute_node": [{"free_ram_mb": 511}]
+            })
+
+        self.mox.ReplayAll()
+        self.assertRaises(exception.MigrationPreCheckError,
+                          self.task._check_requested_destination)
+
+    def test_check_requested_destination_fails_with_hypervisor_diff(self):
+        self.mox.StubOutWithMock(self.task, '_check_host_is_up')
+        self.mox.StubOutWithMock(self.task,
+                '_check_destination_has_enough_memory')
+        self.mox.StubOutWithMock(self.task, '_get_compute_info')
+
+        self.task._check_host_is_up(self.destination)
+        self.task._check_destination_has_enough_memory()
+        self.task._get_compute_info(self.instance_host).AndReturn({
+            "hypervisor_type": "b"
+        })
+        self.task._get_compute_info(self.destination).AndReturn({
+            "hypervisor_type": "a"
+        })
+
+        self.mox.ReplayAll()
+        self.assertRaises(exception.InvalidHypervisorType,
+                          self.task._check_requested_destination)
+
+    def test_check_requested_destination_fails_with_hypervisor_too_old(self):
+        self.mox.StubOutWithMock(self.task, '_check_host_is_up')
+        self.mox.StubOutWithMock(self.task,
+                '_check_destination_has_enough_memory')
+        self.mox.StubOutWithMock(self.task, '_get_compute_info')
+
+        self.task._check_host_is_up(self.destination)
+        self.task._check_destination_has_enough_memory()
+        self.task._get_compute_info(self.instance_host).AndReturn({
+            "hypervisor_type": "a",
+            "hypervisor_version": 7
+        })
+        self.task._get_compute_info(self.destination).AndReturn({
+            "hypervisor_type": "a",
+            "hypervisor_version": 6
+        })
+
+        self.mox.ReplayAll()
+        self.assertRaises(exception.DestinationHypervisorTooOld,
+                          self.task._check_requested_destination)
+
+    def test_find_destination_works(self):
+        self.mox.StubOutWithMock(self.task.image_service, 'show')
+        self.mox.StubOutWithMock(flavors, 'extract_flavor')
+        self.mox.StubOutWithMock(self.task,
+                '_check_compatible_with_source_hypervisor')
+        self.mox.StubOutWithMock(self.task, '_call_livem_checks_on_host')
+
+        self.task.image_service.show(self.context,
+                                     self.instance_image).AndReturn("image")
+        flavors.extract_flavor(self.instance).AndReturn("inst_type")
+        self.task._check_compatible_with_source_hypervisor("host1")
+        self.task._call_livem_checks_on_host("host1")
+
+        self.mox.ReplayAll()
+        self.assertEqual("host1", self.task._find_destination())
+
+    def _test_find_destination_retry_hypervisor_raises(self, error):
+        self.mox.StubOutWithMock(self.task.image_service, 'show')
+        self.mox.StubOutWithMock(flavors, 'extract_flavor')
+        self.mox.StubOutWithMock(self.task,
+                '_check_compatible_with_source_hypervisor')
+        self.mox.StubOutWithMock(self.task, '_call_livem_checks_on_host')
+
+        self.task.image_service.show(self.context,
+                                     self.instance_image).AndReturn("image")
+        flavors.extract_flavor(self.instance).AndReturn("inst_type")
+        self.task._check_compatible_with_source_hypervisor("host1")\
+                .AndRaise(error)
+
+        self.task._check_compatible_with_source_hypervisor("host1")
+        self.task._call_livem_checks_on_host("host1")
+
+        self.mox.ReplayAll()
+        self.assertEqual("host1", self.task._find_destination())
+
+    def test_find_destination_retry_with_old_hypervisor(self):
+        self._test_find_destination_retry_hypervisor_raises(
+                exception.DestinationHypervisorTooOld)
+
+    def test_find_destination_retry_with_invalid_hypervisor_type(self):
+        self._test_find_destination_retry_hypervisor_raises(
+                exception.InvalidHypervisorType)
+
+    def test_find_destination_retry_with_invalid_livem_checks(self):
+        self.mox.StubOutWithMock(self.task.image_service, 'show')
+        self.mox.StubOutWithMock(flavors, 'extract_flavor')
+        self.mox.StubOutWithMock(self.task,
+                '_check_compatible_with_source_hypervisor')
+        self.mox.StubOutWithMock(self.task, '_call_livem_checks_on_host')
+
+        self.task.image_service.show(self.context,
+                                     self.instance_image).AndReturn("image")
+        flavors.extract_flavor(self.instance).AndReturn("inst_type")
+        self.task._check_compatible_with_source_hypervisor("host1")
+        self.task._call_livem_checks_on_host("host1")\
+                .AndRaise(exception.Invalid)
+
+        self.task._check_compatible_with_source_hypervisor("host1")
+        self.task._call_livem_checks_on_host("host1")
+
+        self.mox.ReplayAll()
+        self.assertEqual("host1", self.task._find_destination())
+
+    def test_find_destination_retry_exceeds_max(self):
+        self.flags(scheduler_max_attempts=1)
+        self.mox.StubOutWithMock(self.task.image_service, 'show')
+        self.mox.StubOutWithMock(flavors, 'extract_flavor')
+        self.mox.StubOutWithMock(self.task,
+                '_check_compatible_with_source_hypervisor')
+        self.mox.StubOutWithMock(self.task, '_call_livem_checks_on_host')
+
+        self.task.image_service.show(self.context,
+                                     self.instance_image).AndReturn("image")
+        flavors.extract_flavor(self.instance).AndReturn("inst_type")
+        self.task._check_compatible_with_source_hypervisor("host1")\
+                .AndRaise(exception.DestinationHypervisorTooOld)
+
+        self.mox.ReplayAll()
+        self.assertRaises(exception.NoValidHost, self.task._find_destination)
+
+    def test_not_implemented_rollback(self):
+        self.assertRaises(NotImplementedError, self.task.rollback)
diff --git a/nova/tests/conductor/test_conductor.py b/nova/tests/conductor/test_conductor.py
index a2a015313..7df829a53 100644
--- a/nova/tests/conductor/test_conductor.py
+++ b/nova/tests/conductor/test_conductor.py
@@ -616,13 +616,28 @@ class ConductorTestCase(_BaseTestCase, test.TestCase):
         self.conductor_manager = self.conductor
 
     def test_block_device_mapping_update_or_create(self):
-        fake_bdm = {'id': 'fake-id'}
+        fake_bdm = {'id': 'fake-id', 'device_name': 'foo'}
+        fake_bdm2 = {'id': 'fake-id', 'device_name': 'foo2'}
+        cells_rpcapi = self.conductor.cells_rpcapi
         self.mox.StubOutWithMock(db, 'block_device_mapping_create')
         self.mox.StubOutWithMock(db, 'block_device_mapping_update')
         self.mox.StubOutWithMock(db, 'block_device_mapping_update_or_create')
-        db.block_device_mapping_create(self.context, fake_bdm)
-        db.block_device_mapping_update(self.context, fake_bdm['id'], fake_bdm)
-        db.block_device_mapping_update_or_create(self.context, fake_bdm)
+        self.mox.StubOutWithMock(cells_rpcapi,
+                                 'bdm_update_or_create_at_top')
+        db.block_device_mapping_create(self.context,
+                                       fake_bdm).AndReturn(fake_bdm2)
+        cells_rpcapi.bdm_update_or_create_at_top(self.context, fake_bdm2,
+                                                 create=True)
+        db.block_device_mapping_update(self.context, fake_bdm['id'],
+                                       fake_bdm).AndReturn(fake_bdm2)
+        cells_rpcapi.bdm_update_or_create_at_top(self.context,
+                                                 fake_bdm2,
+                                                 create=False)
+        db.block_device_mapping_update_or_create(
+                self.context, fake_bdm).AndReturn(fake_bdm2)
+        cells_rpcapi.bdm_update_or_create_at_top(self.context,
+                                                 fake_bdm2,
+                                                 create=None)
         self.mox.ReplayAll()
         self.conductor.block_device_mapping_update_or_create(self.context,
                                                              fake_bdm,
@@ -634,22 +649,44 @@ class ConductorTestCase(_BaseTestCase, test.TestCase):
                                                              fake_bdm)
 
     def test_block_device_mapping_destroy(self):
-        fake_bdm = {'id': 'fake-bdm'}
-        fake_bdm2 = {'id': 'fake-bdm-2'}
+        fake_bdm = {'id': 'fake-bdm',
+                    'instance_uuid': 'fake-uuid',
+                    'device_name': 'fake-device1',
+                    'volume_id': 'fake-vol-id1'}
+        fake_bdm2 = {'id': 'fake-bdm-2',
+                     'instance_uuid': 'fake-uuid2',
+                     'device_name': '',
+                     'volume_id': 'fake-vol-id2'}
         fake_inst = {'uuid': 'fake-uuid'}
+
+        cells_rpcapi = self.conductor.cells_rpcapi
+
         self.mox.StubOutWithMock(db, 'block_device_mapping_destroy')
         self.mox.StubOutWithMock(
             db, 'block_device_mapping_destroy_by_instance_and_device')
         self.mox.StubOutWithMock(
             db, 'block_device_mapping_destroy_by_instance_and_volume')
+        self.mox.StubOutWithMock(cells_rpcapi, 'bdm_destroy_at_top')
+
         db.block_device_mapping_destroy(self.context, 'fake-bdm')
+        cells_rpcapi.bdm_destroy_at_top(self.context,
+                                        fake_bdm['instance_uuid'],
+                                        device_name=fake_bdm['device_name'])
         db.block_device_mapping_destroy(self.context, 'fake-bdm-2')
+        cells_rpcapi.bdm_destroy_at_top(self.context,
+                                        fake_bdm2['instance_uuid'],
+                                        volume_id=fake_bdm2['volume_id'])
         db.block_device_mapping_destroy_by_instance_and_device(self.context,
                                                                'fake-uuid',
                                                                'fake-device')
+        cells_rpcapi.bdm_destroy_at_top(self.context, fake_inst['uuid'],
+                                        device_name='fake-device')
         db.block_device_mapping_destroy_by_instance_and_volume(self.context,
                                                                'fake-uuid',
                                                                'fake-volume')
+        cells_rpcapi.bdm_destroy_at_top(self.context, fake_inst['uuid'],
+                                        volume_id='fake-volume')
+
         self.mox.ReplayAll()
         self.conductor.block_device_mapping_destroy(self.context,
                                                     [fake_bdm,
@@ -794,8 +831,12 @@ class ConductorRPCAPITestCase(_BaseTestCase, test.TestCase):
                                                              fake_bdm)
 
     def test_block_device_mapping_destroy(self):
-        fake_bdm = {'id': 'fake-bdm'}
+        fake_bdm = {'id': 'fake-bdm',
+                    'instance_uuid': 'fake-uuid',
+                    'device_name': 'fake-device1',
+                    'volume_id': 'fake-vol-id1'}
         fake_inst = {'uuid': 'fake-uuid'}
+
         self.mox.StubOutWithMock(db, 'block_device_mapping_destroy')
         self.mox.StubOutWithMock(
             db, 'block_device_mapping_destroy_by_instance_and_device')
@@ -945,8 +986,12 @@ class ConductorAPITestCase(_BaseTestCase, test.TestCase):
                                                              'fake-bdm')
 
     def test_block_device_mapping_destroy(self):
-        fake_bdm = {'id': 'fake-bdm'}
+        fake_bdm = {'id': 'fake-bdm',
+                    'instance_uuid': 'fake-uuid',
+                    'device_name': 'fake-device1',
+                    'volume_id': 'fake-vol-id1'}
         fake_inst = {'uuid': 'fake-uuid'}
+
         self.mox.StubOutWithMock(db, 'block_device_mapping_destroy')
         self.mox.StubOutWithMock(
             db, 'block_device_mapping_destroy_by_instance_and_device')
diff --git a/nova/tests/db/test_db_api.py b/nova/tests/db/test_db_api.py
index 81b15b4d5..deaf8d035 100644
--- a/nova/tests/db/test_db_api.py
+++ b/nova/tests/db/test_db_api.py
@@ -30,6 +30,7 @@ from sqlalchemy.dialects import sqlite
 from sqlalchemy import exc
 from sqlalchemy.exc import IntegrityError
 from sqlalchemy import MetaData
+from sqlalchemy.orm import exc as sqlalchemy_orm_exc
 from sqlalchemy.orm import query
 from sqlalchemy.sql.expression import select
 
@@ -1299,10 +1300,11 @@ class ModelsObjectComparatorMixin(object):
             self.assertEqual(value, obj2[key])
 
     def _assertEqualListsOfObjects(self, objs1, objs2, ignored_keys=None):
-        self.assertEqual(len(objs1), len(objs2))
-        objs2 = dict([(o['id'], o) for o in objs2])
-        for o1 in objs1:
-            self._assertEqualObjects(o1, objs2[o1['id']], ignored_keys)
+        obj_to_dict = lambda o: self._dict_from_object(o, ignored_keys)
+        sort_key = lambda d: [d[k] for k in sorted(d)]
+        conv_and_sort = lambda obj: sorted(map(obj_to_dict, obj), key=sort_key)
+
+        self.assertEqual(conv_and_sort(objs1), conv_and_sort(objs2))
 
     def _assertEqualListsOfPrimitivesAsSets(self, primitives1, primitives2):
         self.assertEqual(len(primitives1), len(primitives2))
@@ -1620,19 +1622,40 @@ class SecurityGroupTestCase(test.TestCase, ModelsObjectComparatorMixin):
         self.assertRaises(exception.SecurityGroupNotFound,
                           db.security_group_get,
                           self.ctxt, security_group1['id'])
-        self._assertEqualObjects(db.security_group_get(self.ctxt,
-                                                       security_group2['id']),
-                                 security_group2)
+        self._assertEqualObjects(db.security_group_get(
+                self.ctxt, security_group2['id'],
+                columns_to_join=['instances']), security_group2)
 
     def test_security_group_get(self):
         security_group1 = self._create_security_group({})
         security_group2 = self._create_security_group(
                 {'name': 'fake_sec_group2'})
         real_security_group = db.security_group_get(self.ctxt,
-                                              security_group1['id'])
+                                              security_group1['id'],
+                                              columns_to_join=['instances'])
         self._assertEqualObjects(security_group1,
                                  real_security_group)
 
+    def test_security_group_get_no_instances(self):
+        instance = db.instance_create(self.ctxt, {})
+        sid = self._create_security_group({'instances': [instance]})['id']
+
+        session = get_session()
+        self.mox.StubOutWithMock(sqlalchemy_api, 'get_session')
+        sqlalchemy_api.get_session().AndReturn(session)
+        sqlalchemy_api.get_session().AndReturn(session)
+        self.mox.ReplayAll()
+
+        security_group = db.security_group_get(self.ctxt, sid,
+                                               columns_to_join=['instances'])
+        session.expunge(security_group)
+        self.assertEqual(1, len(security_group['instances']))
+
+        security_group = db.security_group_get(self.ctxt, sid)
+        session.expunge(security_group)
+        self.assertRaises(sqlalchemy_orm_exc.DetachedInstanceError,
+                          getattr, security_group, 'instances')
+
     def test_security_group_get_not_found_exception(self):
         self.assertRaises(exception.SecurityGroupNotFound,
                           db.security_group_get, self.ctxt, 100500)
@@ -3963,12 +3986,15 @@ class BlockDeviceMappingTestCase(test.TestCase):
 
     def test_block_device_mapping_update(self):
         bdm = self._create_bdm({})
-        db.block_device_mapping_update(self.ctxt, bdm['id'],
-                                       {'destination_type': 'moon'},
-                                       legacy=False)
+        result = db.block_device_mapping_update(
+                self.ctxt, bdm['id'], {'destination_type': 'moon'},
+                legacy=False)
         uuid = bdm['instance_uuid']
         bdm_real = db.block_device_mapping_get_all_by_instance(self.ctxt, uuid)
         self.assertEqual(bdm_real[0]['destination_type'], 'moon')
+        # Also make sure the update call returned correct data
+        self.assertEqual(dict(bdm_real[0].iteritems()),
+                         dict(result.iteritems()))
 
     def test_block_device_mapping_update_or_create(self):
         values = {
diff --git a/nova/tests/fake_network.py b/nova/tests/fake_network.py
index 79af362bb..f4e8d3841 100644
--- a/nova/tests/fake_network.py
+++ b/nova/tests/fake_network.py
@@ -27,6 +27,9 @@ from nova.network import manager as network_manager
 from nova.network import model as network_model
 from nova.network import nova_ipam_lib
 from nova.network import rpcapi as network_rpcapi
+from nova.objects import base as obj_base
+from nova.objects import instance_info_cache
+from nova.openstack.common import jsonutils
 from nova.virt.libvirt import config as libvirt_config
 
 
@@ -456,7 +459,7 @@ def _get_fake_cache():
         ipv6_addr = 'fe80:b33f::a8bb:ccff:fedd:eeff'
         info[0]['network']['subnets'].append({'cidr': 'fe80:b33f::/64',
                                               'ips': [_ip(ipv6_addr)]})
-    return info
+    return jsonutils.dumps(info)
 
 
 def _get_instances_with_cached_ips(orig_func, *args, **kwargs):
@@ -464,9 +467,22 @@ def _get_instances_with_cached_ips(orig_func, *args, **kwargs):
     entries
     """
     instances = orig_func(*args, **kwargs)
-    if isinstance(instances, list):
+    context = args[0]
+
+    def _info_cache_for(instance):
+        info_cache = {'network_info': _get_fake_cache(),
+                      'instance_uuid': instance['uuid']}
+        if isinstance(instance, obj_base.NovaObject):
+            _info_cache = instance_info_cache.InstanceInfoCache()
+            instance_info_cache.InstanceInfoCache._from_db_object(context,
+                                                                  _info_cache,
+                                                                  info_cache)
+            info_cache = _info_cache
+        instance['info_cache'] = info_cache
+
+    if isinstance(instances, (list, obj_base.ObjectListBase)):
         for instance in instances:
-            instance['info_cache'] = {'network_info': _get_fake_cache()}
+            _info_cache_for(instance)
     else:
-        instances['info_cache'] = {'network_info': _get_fake_cache()}
+        _info_cache_for(instances)
     return instances
diff --git a/nova/tests/fake_policy.py b/nova/tests/fake_policy.py
index 70f84499a..bbde1787a 100644
--- a/nova/tests/fake_policy.py
+++ b/nova/tests/fake_policy.py
@@ -123,6 +123,7 @@ policy_data = """
     "compute_extension:deferred_delete": "",
     "compute_extension:disk_config": "",
     "compute_extension:evacuate": "is_admin:True",
+    "compute_extension:v3:os-evacuate": "is_admin:True",
     "compute_extension:extended_server_attributes": "",
     "compute_extension:extended_status": "",
     "compute_extension:extended_availability_zone": "",
@@ -132,6 +133,7 @@ policy_data = """
     "compute_extension:fixed_ips": "",
     "compute_extension:v3:os-fixed-ips": "",
     "compute_extension:flavor_access": "",
+    "compute_extension:v3:os-flavor-access": "",
     "compute_extension:flavor_disabled": "",
     "compute_extension:flavor_rxtx": "",
     "compute_extension:flavor_swap": "",
@@ -165,8 +167,12 @@ policy_data = """
     "compute_extension:quotas:show": "",
     "compute_extension:quotas:update": "",
     "compute_extension:quotas:delete": "",
+    "compute_extension:v3:os-quota-sets:show": "",
+    "compute_extension:v3:os-quota-sets:update": "",
+    "compute_extension:v3:os-quota-sets:delete": "",
     "compute_extension:quota_classes": "",
     "compute_extension:rescue": "",
+    "compute_extension:v3:os-rescue": "",
     "compute_extension:security_group_default_rules": "",
     "compute_extension:security_groups": "",
     "compute_extension:server_diagnostics": "",
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index 87ed6c6ce..380b69079 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -47,7 +47,7 @@ from nova.openstack.common import jsonutils
 from nova.openstack.common import log as logging
 from nova.openstack.common import timeutils
 import nova.quota
-from nova.scheduler import driver
+from nova.scheduler import manager as scheduler_manager
 from nova.servicegroup import api as service_group_api
 from nova import test
 from nova.tests.api.openstack.compute.contrib import test_coverage_ext
@@ -2213,23 +2213,13 @@ class AdminActionsSamplesJsonTest(ServersSampleBase):
 
     def test_post_live_migrate_server(self):
         # Get api samples to server live migrate request.
-        def fake_live_migration_src_check(self, context, instance_ref):
-            """Skip live migration scheduler checks."""
+        def fake_live_migration(self, context, instance, dest,
+                                block_migration, disk_over_commit):
             return
 
-        def fake_live_migration_dest_check(self, context, instance_ref, dest):
-            """Skip live migration scheduler checks."""
-            return dest
-
-        def fake_live_migration_common(self, context, instance_ref, dest):
-            """Skip live migration scheduler checks."""
-            return
-        self.stubs.Set(driver.Scheduler, '_live_migration_src_check',
-                       fake_live_migration_src_check)
-        self.stubs.Set(driver.Scheduler, '_live_migration_dest_check',
-                       fake_live_migration_dest_check)
-        self.stubs.Set(driver.Scheduler, '_live_migration_common_check',
-                       fake_live_migration_common)
+        self.stubs.Set(scheduler_manager.SchedulerManager,
+                       'live_migration',
+                       fake_live_migration)
 
         def fake_get_compute(context, host):
             service = dict(host=host,
diff --git a/nova/tests/network/test_quantumv2.py b/nova/tests/network/test_quantumv2.py
index 7f21a2aa9..d97dcae57 100644
--- a/nova/tests/network/test_quantumv2.py
+++ b/nova/tests/network/test_quantumv2.py
@@ -1357,6 +1357,13 @@ class TestQuantumv2(test.TestCase):
         self.assertEqual(nw_info[0]['type'], model.VIF_TYPE_BRIDGE)
         self.assertEqual(nw_info[0]['network']['bridge'], 'brqnet-id')
 
+    def test_get_all_empty_list_networks(self):
+        api = quantumapi.API()
+        self.moxed_client.list_networks().AndReturn({'networks': []})
+        self.mox.ReplayAll()
+        networks = api.get_all(self.context)
+        self.assertEqual(networks, [])
+
 
 class TestQuantumv2ModuleMethods(test.TestCase):
     def test_ensure_requested_network_ordering_no_preference_ids(self):
diff --git a/nova/tests/objects/test_instance.py b/nova/tests/objects/test_instance.py
index 09ce70355..9f222951a 100644
--- a/nova/tests/objects/test_instance.py
+++ b/nova/tests/objects/test_instance.py
@@ -20,8 +20,12 @@ from nova import context
 from nova import db
 from nova.objects import base
 from nova.objects import instance
+from nova.objects import security_group
 from nova.openstack.common import timeutils
+from nova import test
 from nova.tests.api.openstack import fakes
+from nova.tests import fake_instance
+from nova.tests.objects import test_instance_fault
 from nova.tests.objects import test_objects
 
 
@@ -41,6 +45,7 @@ class _TestInstanceObject(object):
                 tzinfo=iso8601.iso8601.Utc(), microsecond=0))
         fake_instance['deleted'] = False
         fake_instance['info_cache']['instance_uuid'] = fake_instance['uuid']
+        fake_instance['security_groups'] = None
         return fake_instance
 
     def test_datetime_deserialization(self):
@@ -102,7 +107,7 @@ class _TestInstanceObject(object):
         self.mox.StubOutWithMock(db, 'instance_get_by_uuid')
         db.instance_get_by_uuid(
             ctxt, 'uuid',
-            instance.INSTANCE_OPTIONAL_FIELDS).AndReturn(self.fake_instance)
+            ['metadata', 'system_metadata']).AndReturn(self.fake_instance)
         self.mox.ReplayAll()
         inst = instance.Instance.get_by_uuid(
             ctxt, 'uuid', expected_attrs=instance.INSTANCE_OPTIONAL_FIELDS)
@@ -213,6 +218,58 @@ class _TestInstanceObject(object):
         inst.info_cache.network_info = 'bar'
         inst.save()
 
+    def test_with_security_groups(self):
+        ctxt = context.get_admin_context()
+        fake_inst = dict(self.fake_instance)
+        fake_uuid = fake_inst['uuid']
+        fake_inst['security_groups'] = [
+            {'id': 1, 'name': 'secgroup1', 'description': 'fake-desc',
+             'user_id': 'fake-user', 'project_id': 'fake_project',
+             'created_at': None, 'updated_at': None, 'deleted_at': None,
+             'deleted': False},
+            {'id': 2, 'name': 'secgroup2', 'description': 'fake-desc',
+             'user_id': 'fake-user', 'project_id': 'fake_project',
+             'created_at': None, 'updated_at': None, 'deleted_at': None,
+             'deleted': False},
+            ]
+        self.mox.StubOutWithMock(db, 'instance_get_by_uuid')
+        self.mox.StubOutWithMock(db, 'instance_update_and_get_original')
+        self.mox.StubOutWithMock(db, 'security_group_update')
+        db.instance_get_by_uuid(ctxt, fake_uuid, []).AndReturn(fake_inst)
+        db.security_group_update(ctxt, 1, {'description': 'changed'}
+                                 ).AndReturn(fake_inst['security_groups'][0])
+        self.mox.ReplayAll()
+        inst = instance.Instance.get_by_uuid(ctxt, fake_uuid)
+        self.assertEqual(len(inst.security_groups), 2)
+        for index, group in enumerate(fake_inst['security_groups']):
+            for key in group:
+                self.assertEqual(group[key],
+                                 inst.security_groups[index][key])
+                self.assertTrue(isinstance(inst.security_groups[index],
+                                           security_group.SecurityGroup))
+        self.assertEqual(inst.security_groups.obj_what_changed(), set())
+        inst.security_groups[0].description = 'changed'
+        inst.save()
+        self.assertEqual(inst.security_groups.obj_what_changed(), set())
+
+    def test_with_fault(self):
+        ctxt = context.get_admin_context()
+        fake_inst = dict(self.fake_instance)
+        fake_uuid = fake_inst['uuid']
+        fake_faults = [dict(x, instance_uuid=fake_uuid)
+                       for x in test_instance_fault.fake_faults['fake-uuid']]
+        self.mox.StubOutWithMock(db, 'instance_get_by_uuid')
+        self.mox.StubOutWithMock(db, 'instance_fault_get_by_instance_uuids')
+        db.instance_get_by_uuid(ctxt, fake_uuid, []).AndReturn(
+            self.fake_instance)
+        db.instance_fault_get_by_instance_uuids(ctxt, [fake_uuid]).AndReturn(
+            {fake_uuid: fake_faults})
+        self.mox.ReplayAll()
+        inst = instance.Instance.get_by_uuid(ctxt, fake_uuid,
+                                             expected_attrs=['fault'])
+        self.assertEqual(fake_faults[0], dict(inst.fault.items()))
+        self.assertRemotes()
+
     def test_iteritems_with_extra_attrs(self):
         self.stubs.Set(instance.Instance, 'name', 'foo')
         inst = instance.Instance()
@@ -248,6 +305,7 @@ class _TestInstanceListObject(object):
                 tzinfo=iso8601.iso8601.Utc(), microsecond=0))
         fake_instance['info_cache'] = {'network_info': 'foo',
                                        'instance_uuid': fake_instance['uuid']}
+        fake_instance['security_groups'] = []
         fake_instance['deleted'] = 0
         if updates:
             fake_instance.update(updates)
@@ -258,7 +316,7 @@ class _TestInstanceListObject(object):
         ctxt = context.get_admin_context()
         self.mox.StubOutWithMock(db, 'instance_get_all_by_filters')
         db.instance_get_all_by_filters(ctxt, {'foo': 'bar'}, 'uuid', 'asc',
-                                       None, None,
+                                       limit=None, marker=None,
                                        columns_to_join=['metadata']).AndReturn(
                                            fakes)
         self.mox.ReplayAll()
@@ -337,6 +395,27 @@ class _TestInstanceListObject(object):
             self.assertEqual(inst_list.objects[i].uuid, fakes[i]['uuid'])
         self.assertRemotes()
 
+    def test_with_fault(self):
+        ctxt = context.get_admin_context()
+        fake_insts = [
+            fake_instance.fake_db_instance(uuid='fake-uuid', host='host'),
+            fake_instance.fake_db_instance(uuid='fake-inst2', host='host'),
+            ]
+        fake_faults = test_instance_fault.fake_faults
+        self.mox.StubOutWithMock(db, 'instance_get_all_by_host')
+        self.mox.StubOutWithMock(db, 'instance_fault_get_by_instance_uuids')
+        db.instance_get_all_by_host(ctxt, 'host', columns_to_join=[]
+                                    ).AndReturn(fake_insts)
+        db.instance_fault_get_by_instance_uuids(
+            ctxt, [x['uuid'] for x in fake_insts]).AndReturn(fake_faults)
+        self.mox.ReplayAll()
+        instances = instance.InstanceList.get_by_host(ctxt, 'host',
+                                                      expected_attrs=['fault'])
+        self.assertEqual(2, len(instances))
+        self.assertEqual(fake_faults['fake-uuid'][0],
+                         dict(instances[0].fault.iteritems()))
+        self.assertEqual(None, instances[1].fault)
+
 
 class TestInstanceListObject(test_objects._LocalTest,
                              _TestInstanceListObject):
@@ -346,3 +425,10 @@ class TestInstanceListObject(test_objects._LocalTest,
 class TestRemoteInstanceListObject(test_objects._RemoteTest,
                                    _TestInstanceListObject):
     pass
+
+
+class TestInstanceObjectMisc(test.TestCase):
+    def test_expected_cols(self):
+        self.stubs.Set(instance, 'INSTANCE_OPTIONAL_NON_COLUMNS', ['bar'])
+        self.assertEqual(['foo'], instance.expected_cols(['foo', 'bar']))
+        self.assertEqual(None, instance.expected_cols(None))
diff --git a/nova/tests/objects/test_instance_fault.py b/nova/tests/objects/test_instance_fault.py
new file mode 100644
index 000000000..2f9840df1
--- /dev/null
+++ b/nova/tests/objects/test_instance_fault.py
@@ -0,0 +1,86 @@
+#    Copyright 2013 IBM Corp.
+#
+#    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.
+
+from nova import context
+from nova import db
+from nova.objects import instance_fault
+from nova.tests.objects import test_objects
+
+
+fake_faults = {
+    'fake-uuid': [
+        {'id': 1, 'instance_uuid': 'fake-uuid', 'code': 123, 'message': 'msg1',
+         'details': 'details', 'host': 'host', 'deleted': False,
+         'created_at': None, 'updated_at': None, 'deleted_at': None},
+        {'id': 2, 'instance_uuid': 'fake-uuid', 'code': 456, 'message': 'msg2',
+         'details': 'details', 'host': 'host', 'deleted': False,
+         'created_at': None, 'updated_at': None, 'deleted_at': None},
+        ]
+    }
+
+
+class _TestInstanceFault(object):
+    def test_get_latest_for_instance(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'instance_fault_get_by_instance_uuids')
+        db.instance_fault_get_by_instance_uuids(ctxt, ['fake-uuid']).AndReturn(
+            fake_faults)
+        self.mox.ReplayAll()
+        fault = instance_fault.InstanceFault.get_latest_for_instance(
+            ctxt, 'fake-uuid')
+        for key in fake_faults['fake-uuid'][0]:
+            self.assertEqual(fake_faults['fake-uuid'][0][key], fault[key])
+
+    def test_get_latest_for_instance_with_none(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'instance_fault_get_by_instance_uuids')
+        db.instance_fault_get_by_instance_uuids(ctxt, ['fake-uuid']).AndReturn(
+            {})
+        self.mox.ReplayAll()
+        fault = instance_fault.InstanceFault.get_latest_for_instance(
+            ctxt, 'fake-uuid')
+        self.assertEqual(None, fault)
+
+    def test_get_by_instance(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'instance_fault_get_by_instance_uuids')
+        db.instance_fault_get_by_instance_uuids(ctxt, ['fake-uuid']).AndReturn(
+            fake_faults)
+        self.mox.ReplayAll()
+        faults = instance_fault.InstanceFaultList.get_by_instance_uuids(
+            ctxt, ['fake-uuid'])
+        for index, db_fault in enumerate(fake_faults['fake-uuid']):
+            for key in db_fault:
+                self.assertEqual(fake_faults['fake-uuid'][index][key],
+                                 faults[index][key])
+
+    def test_get_by_instance_with_none(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'instance_fault_get_by_instance_uuids')
+        db.instance_fault_get_by_instance_uuids(ctxt, ['fake-uuid']).AndReturn(
+            {})
+        self.mox.ReplayAll()
+        faults = instance_fault.InstanceFaultList.get_by_instance_uuids(
+            ctxt, ['fake-uuid'])
+        self.assertEqual(0, len(faults))
+
+
+class TestInstanceFault(test_objects._LocalTest,
+                        _TestInstanceFault):
+    pass
+
+
+class TestInstanceFaultRemote(test_objects._RemoteTest,
+                              _TestInstanceFault):
+    pass
diff --git a/nova/tests/objects/test_objects.py b/nova/tests/objects/test_objects.py
index 332833cb0..03a270386 100644
--- a/nova/tests/objects/test_objects.py
+++ b/nova/tests/objects/test_objects.py
@@ -178,6 +178,31 @@ class TestUtils(test.TestCase):
         self.assertEqual(utils.dt_deserializer(None, None), None)
         self.assertRaises(ValueError, utils.dt_deserializer, None, 'foo')
 
+    def test_obj_to_primitive_list(self):
+        class MyList(base.ObjectListBase, base.NovaObject):
+            pass
+        mylist = MyList()
+        mylist.objects = [1, 2, 3]
+        self.assertEqual([1, 2, 3], base.obj_to_primitive(mylist))
+
+    def test_obj_to_primitive_dict(self):
+        myobj = MyObj()
+        myobj.foo = 1
+        myobj.bar = 'foo'
+        self.assertEqual({'foo': 1, 'bar': 'foo'},
+                         base.obj_to_primitive(myobj))
+
+    def test_obj_to_primitive_recursive(self):
+        class MyList(base.ObjectListBase, base.NovaObject):
+            pass
+
+        mylist = MyList()
+        mylist.objects = [MyObj(), MyObj()]
+        for i, value in enumerate(mylist):
+            value.foo = i
+        self.assertEqual([{'foo': 0}, {'foo': 1}],
+                         base.obj_to_primitive(mylist))
+
 
 class _BaseTestCase(test.TestCase):
     def setUp(self):
@@ -441,6 +466,13 @@ class _TestObject(object):
                     }
         self.assertEqual(obj.obj_to_primitive(), expected)
 
+    def test_contains(self):
+        obj = MyObj()
+        self.assertFalse('foo' in obj)
+        obj.foo = 1
+        self.assertTrue('foo' in obj)
+        self.assertFalse('does_not_exist' in obj)
+
 
 class TestObject(_LocalTest, _TestObject):
     pass
@@ -502,3 +534,40 @@ class TestObjectListBase(test.TestCase):
         self.assertFalse(obj is obj2)
         self.assertEqual([x.foo for x in obj],
                          [y.foo for y in obj2])
+
+
+class TestObjectSerializer(test.TestCase):
+    def test_serialize_entity_primitive(self):
+        ser = base.NovaObjectSerializer()
+        for thing in (1, 'foo', [1, 2], {'foo': 'bar'}):
+            self.assertEqual(thing, ser.serialize_entity(None, thing))
+
+    def test_deserialize_entity_primitive(self):
+        ser = base.NovaObjectSerializer()
+        for thing in (1, 'foo', [1, 2], {'foo': 'bar'}):
+            self.assertEqual(thing, ser.deserialize_entity(None, thing))
+
+    def test_object_serialization(self):
+        ser = base.NovaObjectSerializer()
+        ctxt = context.get_admin_context()
+        obj = MyObj()
+        primitive = ser.serialize_entity(ctxt, obj)
+        self.assertTrue('nova_object.name' in primitive)
+        obj2 = ser.deserialize_entity(ctxt, primitive)
+        self.assertTrue(isinstance(obj2, MyObj))
+        self.assertEqual(ctxt, obj2._context)
+
+    def test_object_serialization_iterables(self):
+        ser = base.NovaObjectSerializer()
+        ctxt = context.get_admin_context()
+        obj = MyObj()
+        for iterable in (list, tuple, set):
+            thing = iterable([obj])
+            primitive = ser.serialize_entity(ctxt, thing)
+            self.assertEqual(1, len(primitive))
+            for item in primitive:
+                self.assertFalse(isinstance(item, base.NovaObject))
+            thing2 = ser.deserialize_entity(ctxt, primitive)
+            self.assertEqual(1, len(thing2))
+            for item in thing2:
+                self.assertTrue(isinstance(item, MyObj))
diff --git a/nova/tests/objects/test_security_group.py b/nova/tests/objects/test_security_group.py
new file mode 100644
index 000000000..ee2f79ad7
--- /dev/null
+++ b/nova/tests/objects/test_security_group.py
@@ -0,0 +1,186 @@
+#    Copyright 2013 IBM Corp.
+#
+#    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.
+
+from nova import context
+from nova import db
+from nova.objects import instance
+from nova.objects import security_group
+from nova.tests.objects import test_objects
+
+
+fake_secgroup = {
+    'created_at': None,
+    'updated_at': None,
+    'deleted_at': None,
+    'deleted': None,
+    'id': 1,
+    'name': 'fake-name',
+    'description': 'fake-desc',
+    'user_id': 'fake-user',
+    'project_id': 'fake-project',
+    }
+
+
+class _TestSecurityGroupObject(object):
+    def _fix_deleted(self, db_secgroup):
+        # NOTE(danms): Account for the difference in 'deleted'
+        return dict(db_secgroup.items(), deleted=False)
+
+    def test_get(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'security_group_get')
+        db.security_group_get(ctxt, 1).AndReturn(fake_secgroup)
+        self.mox.ReplayAll()
+        secgroup = security_group.SecurityGroup.get(ctxt, 1)
+        self.assertEqual(self._fix_deleted(fake_secgroup),
+                         dict(secgroup.items()))
+        self.assertEqual(secgroup.obj_what_changed(), set())
+        self.assertRemotes()
+
+    def test_get_by_name(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'security_group_get_by_name')
+        db.security_group_get_by_name(ctxt, 'fake-project',
+                                      'fake-name').AndReturn(fake_secgroup)
+        self.mox.ReplayAll()
+        secgroup = security_group.SecurityGroup.get_by_name(ctxt,
+                                                            'fake-project',
+                                                            'fake-name')
+        self.assertEqual(self._fix_deleted(fake_secgroup),
+                         dict(secgroup.items()))
+        self.assertEqual(secgroup.obj_what_changed(), set())
+        self.assertRemotes()
+
+    def test_in_use(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'security_group_in_use')
+        db.security_group_in_use(ctxt, 123).AndReturn(True)
+        self.mox.ReplayAll()
+        secgroup = security_group.SecurityGroup()
+        secgroup.id = 123
+        self.assertTrue(secgroup.in_use(ctxt))
+        self.assertRemotes()
+
+    def test_save(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'security_group_update')
+        updated_secgroup = dict(fake_secgroup, project_id='changed')
+        db.security_group_update(ctxt, 1,
+                                 {'description': 'foobar'}).AndReturn(
+                                     updated_secgroup)
+        self.mox.ReplayAll()
+        secgroup = security_group.SecurityGroup._from_db_object(
+            security_group.SecurityGroup(), fake_secgroup)
+        secgroup.description = 'foobar'
+        secgroup.save(ctxt)
+        self.assertEqual(self._fix_deleted(updated_secgroup),
+                         dict(secgroup.items()))
+        self.assertEqual(secgroup.obj_what_changed(), set())
+        self.assertRemotes()
+
+    def test_save_no_changes(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'security_group_update')
+        self.mox.ReplayAll()
+        secgroup = security_group.SecurityGroup._from_db_object(
+            security_group.SecurityGroup(), fake_secgroup)
+        secgroup.save(ctxt)
+
+    def test_refresh(self):
+        ctxt = context.get_admin_context()
+        updated_secgroup = dict(fake_secgroup, description='changed')
+        self.mox.StubOutWithMock(db, 'security_group_get')
+        db.security_group_get(ctxt, 1).AndReturn(updated_secgroup)
+        self.mox.ReplayAll()
+        secgroup = security_group.SecurityGroup._from_db_object(
+            security_group.SecurityGroup(), fake_secgroup)
+        secgroup.refresh(ctxt)
+        self.assertEqual(self._fix_deleted(updated_secgroup),
+                         dict(secgroup.items()))
+        self.assertEqual(secgroup.obj_what_changed(), set())
+        self.assertRemotes()
+
+
+class TestSecurityGroupObject(test_objects._LocalTest,
+                              _TestSecurityGroupObject):
+    pass
+
+
+class TestSecurityGroupObjectRemote(test_objects._RemoteTest,
+                                    _TestSecurityGroupObject):
+    pass
+
+
+fake_secgroups = [
+    dict(fake_secgroup, id=1, name='secgroup1'),
+    dict(fake_secgroup, id=2, name='secgroup2'),
+    ]
+
+
+class _TestSecurityGroupListObject(object):
+    def test_get_all(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'security_group_get_all')
+        db.security_group_get_all(ctxt).AndReturn(fake_secgroups)
+        self.mox.ReplayAll()
+        secgroup_list = security_group.SecurityGroupList.get_all(ctxt)
+        for i in range(len(fake_secgroups)):
+            self.assertTrue(isinstance(secgroup_list[i],
+                                       security_group.SecurityGroup))
+            self.assertEqual(fake_secgroups[i]['id'],
+                             secgroup_list[i]['id'])
+            self.assertEqual(secgroup_list[i]._context, ctxt)
+
+    def test_get_by_project(self):
+        ctxt = context.get_admin_context()
+        self.mox.StubOutWithMock(db, 'security_group_get_by_project')
+        db.security_group_get_by_project(ctxt,
+                                         'fake-project').AndReturn(
+                                             fake_secgroups)
+        self.mox.ReplayAll()
+        secgroup_list = security_group.SecurityGroupList.get_by_project(
+            ctxt, 'fake-project')
+        for i in range(len(fake_secgroups)):
+            self.assertTrue(isinstance(secgroup_list[i],
+                                       security_group.SecurityGroup))
+            self.assertEqual(fake_secgroups[i]['id'],
+                             secgroup_list[i]['id'])
+
+    def test_get_by_instance(self):
+        ctxt = context.get_admin_context()
+
+        inst = instance.Instance()
+        inst.uuid = 'fake-inst-uuid'
+        self.mox.StubOutWithMock(db, 'security_group_get_by_instance')
+        db.security_group_get_by_instance(ctxt,
+                                          'fake-inst-uuid').AndReturn(
+                                              fake_secgroups)
+        self.mox.ReplayAll()
+        secgroup_list = security_group.SecurityGroupList.get_by_instance(
+            ctxt, inst)
+        for i in range(len(fake_secgroups)):
+            self.assertTrue(isinstance(secgroup_list[i],
+                                       security_group.SecurityGroup))
+            self.assertEqual(fake_secgroups[i]['id'],
+                             secgroup_list[i]['id'])
+
+
+class TestSecurityGroupListObject(test_objects._LocalTest,
+                                  _TestSecurityGroupListObject):
+    pass
+
+
+class TestSecurityGroupListObjectRemote(test_objects._RemoteTest,
+                                        _TestSecurityGroupListObject):
+    pass
diff --git a/nova/tests/scheduler/test_chance_scheduler.py b/nova/tests/scheduler/test_chance_scheduler.py
index cfe7f5d63..ba1701e93 100644
--- a/nova/tests/scheduler/test_chance_scheduler.py
+++ b/nova/tests/scheduler/test_chance_scheduler.py
@@ -68,15 +68,11 @@ class ChanceSchedulerTestCase(test_scheduler.SchedulerTestCase):
     def test_basic_schedule_run_instance(self):
         ctxt = context.RequestContext('fake', 'fake', False)
         ctxt_elevated = 'fake-context-elevated'
-        fake_args = (1, 2, 3)
         instance_opts = {'fake_opt1': 'meow', 'launch_index': -1}
         instance1 = {'uuid': 'fake-uuid1'}
         instance2 = {'uuid': 'fake-uuid2'}
         request_spec = {'instance_uuids': ['fake-uuid1', 'fake-uuid2'],
                         'instance_properties': instance_opts}
-        instance1_encoded = {'uuid': 'fake-uuid1', '_is_precooked': False}
-        instance2_encoded = {'uuid': 'fake-uuid2', '_is_precooked': False}
-        reservations = ['resv1', 'resv2']
 
         def inc_launch_index(*args):
             request_spec['instance_properties']['launch_index'] = (
@@ -118,7 +114,6 @@ class ChanceSchedulerTestCase(test_scheduler.SchedulerTestCase):
     def test_basic_schedule_run_instance_no_hosts(self):
         ctxt = context.RequestContext('fake', 'fake', False)
         ctxt_elevated = 'fake-context-elevated'
-        fake_args = (1, 2, 3)
         uuid = 'fake-uuid1'
         instance_opts = {'fake_opt1': 'meow', 'launch_index': -1}
         request_spec = {'instance_uuids': [uuid],
@@ -170,10 +165,7 @@ class ChanceSchedulerTestCase(test_scheduler.SchedulerTestCase):
     def test_select_hosts(self):
         ctxt = context.RequestContext('fake', 'fake', False)
         ctxt_elevated = 'fake-context-elevated'
-        fake_args = (1, 2, 3)
         instance_opts = {'fake_opt1': 'meow', 'launch_index': -1}
-        instance1 = {'uuid': 'fake-uuid1'}
-        instance2 = {'uuid': 'fake-uuid2'}
         request_spec = {'instance_uuids': ['fake-uuid1', 'fake-uuid2'],
                         'instance_properties': instance_opts}
 
diff --git a/nova/tests/scheduler/test_filter_scheduler.py b/nova/tests/scheduler/test_filter_scheduler.py
index d6cc7808e..ac2e73ec7 100644
--- a/nova/tests/scheduler/test_filter_scheduler.py
+++ b/nova/tests/scheduler/test_filter_scheduler.py
@@ -25,12 +25,10 @@ from nova.conductor import api as conductor_api
 from nova import context
 from nova import db
 from nova import exception
-from nova.openstack.common import rpc
 from nova.scheduler import driver
 from nova.scheduler import filter_scheduler
 from nova.scheduler import host_manager
 from nova.scheduler import weights
-from nova import servicegroup
 from nova.tests.scheduler import fakes
 from nova.tests.scheduler import test_scheduler
 
@@ -393,143 +391,6 @@ class FilterSchedulerTestCase(test_scheduler.SchedulerTestCase):
         self.assertEqual([['host', 'node']],
                          filter_properties['retry']['hosts'])
 
-    def test_live_migration_dest_check_service_memory_overcommit(self):
-        instance = self._live_migration_instance()
-
-        # Live-migration should work since default is to overcommit memory.
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-        self.mox.StubOutWithMock(servicegroup.API, 'service_is_up')
-        self.mox.StubOutWithMock(self.driver, '_get_compute_info')
-        self.mox.StubOutWithMock(self.driver, '_live_migration_common_check')
-        self.mox.StubOutWithMock(rpc, 'call')
-        self.mox.StubOutWithMock(self.driver.compute_rpcapi, 'live_migration')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-
-        self.driver._live_migration_src_check(self.context, instance)
-        db.service_get_by_compute_host(self.context,
-                dest).AndReturn('fake_service3')
-        self.servicegroup_api.service_is_up('fake_service3').AndReturn(True)
-
-        self.driver._get_compute_info(self.context, dest).AndReturn(
-                                                       {'memory_mb': 2048,
-                                                        'free_disk_gb': 512,
-                                                        'local_gb_used': 512,
-                                                        'free_ram_mb': 512,
-                                                        'local_gb': 1024,
-                                                        'vcpus': 4,
-                                                        'vcpus_used': 2,
-                                                        'updated_at': None})
-
-        self.driver._live_migration_common_check(self.context, instance, dest)
-
-        rpc.call(self.context, "compute.fake_host2",
-                   {"method": 'check_can_live_migrate_destination',
-                    "namespace": None,
-                    "args": {'instance': instance,
-                             'block_migration': block_migration,
-                             'disk_over_commit': disk_over_commit},
-                    "version": compute_rpcapi.ComputeAPI.BASE_RPC_API_VERSION},
-                 None).AndReturn({})
-
-        self.driver.compute_rpcapi.live_migration(self.context,
-                host=instance['host'], instance=instance, dest=dest,
-                block_migration=block_migration, migrate_data={})
-
-        self.mox.ReplayAll()
-        result = self.driver.schedule_live_migration(self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-        self.assertEqual(result, None)
-
-    def test_live_migration_assert_memory_no_overcommit(self):
-        # Test that memory check passes with no memory overcommit.
-        def fake_get(context, host):
-            return {'memory_mb': 2048,
-                    'free_disk_gb': 512,
-                    'local_gb_used': 512,
-                    'free_ram_mb': 1024,
-                    'local_gb': 1024,
-                    'vcpus': 4,
-                    'vcpus_used': 2,
-                    'updated_at': None}
-
-        self.stubs.Set(self.driver, '_get_compute_info', fake_get)
-
-        self.flags(ram_allocation_ratio=1.0)
-        instance = self._live_migration_instance()
-        dest = 'fake_host2'
-        result = self.driver._assert_compute_node_has_enough_memory(
-                self.context, instance, dest)
-        self.assertEqual(result, None)
-
-    def test_live_migration_assert_memory_no_overcommit_lack_memory(self):
-        # Test that memory check fails with no memory overcommit.
-        def fake_get(context, host):
-            return {'memory_mb': 2048,
-                    'free_disk_gb': 512,
-                    'local_gb_used': 512,
-                    'free_ram_mb': 1023,
-                    'local_gb': 1024,
-                    'vcpus': 4,
-                    'vcpus_used': 2,
-                    'updated_at': None}
-
-        self.stubs.Set(self.driver, '_get_compute_info', fake_get)
-
-        self.flags(ram_allocation_ratio=1.0)
-        instance = self._live_migration_instance()
-        dest = 'fake_host2'
-        self.assertRaises(exception.MigrationError,
-                self.driver._assert_compute_node_has_enough_memory,
-                context, instance, dest)
-
-    def test_live_migration_assert_memory_overcommit(self):
-        # Test that memory check passes with memory overcommit.
-        def fake_get(context, host):
-            return {'memory_mb': 2048,
-                    'free_disk_gb': 512,
-                    'local_gb_used': 512,
-                    'free_ram_mb': -1024,
-                    'local_gb': 1024,
-                    'vcpus': 4,
-                    'vcpus_used': 2,
-                    'updated_at': None}
-
-        self.stubs.Set(self.driver, '_get_compute_info', fake_get)
-
-        self.flags(ram_allocation_ratio=2.0)
-        instance = self._live_migration_instance()
-        dest = 'fake_host2'
-        result = self.driver._assert_compute_node_has_enough_memory(
-                self.context, instance, dest)
-        self.assertEqual(result, None)
-
-    def test_live_migration_assert_memory_overcommit_lack_memory(self):
-        # Test that memory check fails with memory overcommit.
-        def fake_get(context, host):
-            return {'memory_mb': 2048,
-                    'free_disk_gb': 512,
-                    'local_gb_used': 512,
-                    'free_ram_mb': -1025,
-                    'local_gb': 1024,
-                    'vcpus': 4,
-                    'vcpus_used': 2,
-                    'updated_at': None}
-
-        self.stubs.Set(self.driver, '_get_compute_info', fake_get)
-
-        self.flags(ram_allocation_ratio=2.0)
-        instance = self._live_migration_instance()
-        dest = 'fake_host2'
-        self.assertRaises(exception.MigrationError,
-                self.driver._assert_compute_node_has_enough_memory,
-                self.context, instance, dest)
-
     def test_basic_schedule_run_instances_anti_affinity(self):
         filter_properties = {'scheduler_hints':
                              {'group': 'cats'}}
diff --git a/nova/tests/scheduler/test_host_filters.py b/nova/tests/scheduler/test_host_filters.py
index 9306615ed..48d4db1fd 100644
--- a/nova/tests/scheduler/test_host_filters.py
+++ b/nova/tests/scheduler/test_host_filters.py
@@ -316,9 +316,6 @@ class HostFiltersTestCase(test.NoDBTestCase):
     def test_affinity_different_filter_handles_none(self):
         filt_cls = self.class_map['DifferentHostFilter']()
         host = fakes.FakeHostState('host1', 'node1', {})
-        instance = fakes.FakeInstance(context=self.context,
-                                         params={'host': 'host2'})
-        instance_uuid = instance.uuid
 
         filter_properties = {'context': self.context.elevated(),
                              'scheduler_hints': None}
@@ -381,9 +378,6 @@ class HostFiltersTestCase(test.NoDBTestCase):
     def test_affinity_same_filter_handles_none(self):
         filt_cls = self.class_map['SameHostFilter']()
         host = fakes.FakeHostState('host1', 'node1', {})
-        instance = fakes.FakeInstance(context=self.context,
-                                         params={'host': 'host2'})
-        instance_uuid = instance.uuid
 
         filter_properties = {'context': self.context.elevated(),
                              'scheduler_hints': None}
@@ -953,7 +947,6 @@ class HostFiltersTestCase(test.NoDBTestCase):
                                                'local_gb': 200},
                            'scheduler_hints': {'query': json_query}}
         capabilities = {'enabled': True}
-        service = {'disabled': True}
         host = fakes.FakeHostState('host1', 'node1',
                 {'free_ram_mb': 1024,
                  'free_disk_mb': 200 * 1024,
@@ -1385,6 +1378,8 @@ class HostFiltersTestCase(test.NoDBTestCase):
         filt_cls = self.class_map['IoOpsFilter']()
         host = fakes.FakeHostState('host1', 'node1',
                                    {'num_io_ops': 8})
+        filter_properties = {}
+        self.assertFalse(filt_cls.host_passes(host, filter_properties))
 
     def test_filter_num_instances_passes(self):
         self.flags(max_instances_per_host=5)
diff --git a/nova/tests/scheduler/test_scheduler.py b/nova/tests/scheduler/test_scheduler.py
index 0574f6d2e..149c6d3c8 100644
--- a/nova/tests/scheduler/test_scheduler.py
+++ b/nova/tests/scheduler/test_scheduler.py
@@ -22,20 +22,16 @@ Tests For Scheduler
 import mox
 
 from nova.compute import api as compute_api
-from nova.compute import flavors
-from nova.compute import power_state
-from nova.compute import rpcapi as compute_rpcapi
 from nova.compute import task_states
 from nova.compute import utils as compute_utils
 from nova.compute import vm_states
 from nova.conductor import api as conductor_api
+from nova.conductor.tasks import live_migrate
 from nova import context
 from nova import db
 from nova import exception
 from nova.image import glance
-from nova.openstack.common import jsonutils
 from nova.openstack.common.notifier import api as notifier
-from nova.openstack.common import rpc
 from nova.openstack.common.rpc import common as rpc_common
 from nova.scheduler import driver
 from nova.scheduler import manager
@@ -45,7 +41,6 @@ from nova.tests import fake_instance_actions
 from nova.tests.image import fake as fake_image
 from nova.tests import matchers
 from nova.tests.scheduler import fakes
-from nova import utils
 
 
 class SchedulerManagerTestCase(test.NoDBTestCase):
@@ -88,7 +83,7 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
         self.manager.driver.update_service_capabilities(service_name,
                 host, {})
         self.mox.ReplayAll()
-        result = self.manager.update_service_capabilities(self.context,
+        self.manager.update_service_capabilities(self.context,
                 service_name=service_name, host=host, capabilities={})
         self.mox.VerifyAll()
 
@@ -98,7 +93,7 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
         self.manager.driver.update_service_capabilities(
                 service_name, host, capabilities)
         self.mox.ReplayAll()
-        result = self.manager.update_service_capabilities(self.context,
+        self.manager.update_service_capabilities(self.context,
                 service_name=service_name, host=host,
                 capabilities=capabilities)
 
@@ -220,11 +215,11 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
         block_migration = False
         disk_over_commit = False
 
-        self._mox_schedule_method_helper('schedule_live_migration')
+        self.mox.StubOutWithMock(self.manager, '_schedule_live_migration')
         self.mox.StubOutWithMock(compute_utils, 'add_instance_fault_from_exc')
         self.mox.StubOutWithMock(db, 'instance_update_and_get_original')
 
-        self.manager.driver.schedule_live_migration(self.context,
+        self.manager._schedule_live_migration(self.context,
                     inst, dest, block_migration, disk_over_commit).AndRaise(
                     exception.NoValidHost(reason=""))
         db.instance_update_and_get_original(self.context, inst["uuid"],
@@ -253,11 +248,11 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
         block_migration = False
         disk_over_commit = False
 
-        self._mox_schedule_method_helper('schedule_live_migration')
+        self.mox.StubOutWithMock(self.manager, '_schedule_live_migration')
         self.mox.StubOutWithMock(compute_utils, 'add_instance_fault_from_exc')
         self.mox.StubOutWithMock(db, 'instance_update_and_get_original')
 
-        self.manager.driver.schedule_live_migration(self.context,
+        self.manager._schedule_live_migration(self.context,
                     inst, dest, block_migration, disk_over_commit).AndRaise(
                     exception.ComputeServiceUnavailable(host="src"))
         db.instance_update_and_get_original(self.context, inst["uuid"],
@@ -277,6 +272,17 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
                           self.context, inst, dest, block_migration,
                           disk_over_commit)
 
+    def test_live_migrate(self):
+        instance = {'host': 'h'}
+        self.mox.StubOutClassWithMocks(live_migrate, "LiveMigrationTask")
+        task = live_migrate.LiveMigrationTask(self.context, instance,
+                    "dest", "bm", "doc", self.manager.driver.select_hosts)
+        task.execute()
+
+        self.mox.ReplayAll()
+        self.manager.live_migration(self.context, instance, "dest",
+                                    "bm", "doc")
+
     def test_live_migration_set_vmstate_error(self):
         inst = {"uuid": "fake-instance-id",
                 "vm_state": vm_states.ACTIVE, }
@@ -285,11 +291,11 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
         block_migration = False
         disk_over_commit = False
 
-        self._mox_schedule_method_helper('schedule_live_migration')
+        self.mox.StubOutWithMock(self.manager, '_schedule_live_migration')
         self.mox.StubOutWithMock(compute_utils, 'add_instance_fault_from_exc')
         self.mox.StubOutWithMock(db, 'instance_update_and_get_original')
 
-        self.manager.driver.schedule_live_migration(self.context,
+        self.manager._schedule_live_migration(self.context,
                     inst, dest, block_migration, disk_over_commit).AndRaise(
                     ValueError)
         db.instance_update_and_get_original(self.context, inst["uuid"],
@@ -402,6 +408,17 @@ class SchedulerManagerTestCase(test.NoDBTestCase):
         self.manager._set_vm_state_and_notify('foo', {'vm_state': 'foo'},
                                               self.context, None, request)
 
+    def test_select_hosts_throws_rpc_clientexception(self):
+        self.mox.StubOutWithMock(self.manager.driver, 'select_hosts')
+
+        self.manager.driver.select_hosts(self.context, {}, {}).AndRaise(
+                exception.NoValidHost(reason=""))
+
+        self.mox.ReplayAll()
+        self.assertRaises(rpc_common.ClientException,
+                          self.manager.select_hosts,
+                          self.context, {}, {})
+
 
 class SchedulerTestCase(test.NoDBTestCase):
     """Test case for base scheduler driver class."""
@@ -444,7 +461,7 @@ class SchedulerTestCase(test.NoDBTestCase):
         self.driver.host_manager.update_service_capabilities(
                 service_name, host, capabilities)
         self.mox.ReplayAll()
-        result = self.driver.update_service_capabilities(service_name,
+        self.driver.update_service_capabilities(service_name,
                 host, capabilities)
 
     def test_hosts_up(self):
@@ -464,482 +481,6 @@ class SchedulerTestCase(test.NoDBTestCase):
         result = self.driver.hosts_up(self.context, self.topic)
         self.assertEqual(result, ['host2'])
 
-    def _live_migration_instance(self):
-        inst_type = {'memory_mb': 1024, 'root_gb': 40, 'deleted_at': None,
-                     'name': u'm1.medium', 'deleted': 0, 'created_at': None,
-                     'ephemeral_gb': 0, 'updated_at': None, 'disabled': False,
-                     'vcpus': 2, 'extra_specs': {}, 'swap': 0,
-                     'rxtx_factor': 1.0, 'is_public': True, 'flavorid': u'3',
-                     'vcpu_weight': None, 'id': 1}
-
-        sys_meta = utils.dict_to_metadata(
-            flavors.save_flavor_info({}, inst_type))
-        return {'id': 31337,
-                'uuid': 'fake_uuid',
-                'name': 'fake-instance',
-                'host': 'fake_host1',
-                'power_state': power_state.RUNNING,
-                'memory_mb': 1024,
-                'root_gb': 1024,
-                'ephemeral_gb': 0,
-                'vm_state': '',
-                'task_state': '',
-                'instance_type_id': inst_type['id'],
-                'image_ref': 'fake-image-ref',
-                'system_metadata': sys_meta}
-
-    def test_live_migration_basic(self):
-        # Test basic schedule_live_migration functionality.
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        self.mox.StubOutWithMock(self.driver, '_live_migration_dest_check')
-        self.mox.StubOutWithMock(self.driver, '_live_migration_common_check')
-        self.mox.StubOutWithMock(self.driver.compute_rpcapi,
-                                 'check_can_live_migrate_destination')
-        self.mox.StubOutWithMock(self.driver.compute_rpcapi,
-                                 'live_migration')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = jsonutils.to_primitive(self._live_migration_instance())
-
-        self.driver._live_migration_src_check(self.context, instance)
-        self.driver._live_migration_dest_check(self.context, instance,
-                                               dest).AndReturn(dest)
-        self.driver._live_migration_common_check(self.context, instance,
-                                                 dest)
-        self.driver.compute_rpcapi.check_can_live_migrate_destination(
-               self.context, instance, dest, block_migration,
-               disk_over_commit).AndReturn({})
-        self.driver.compute_rpcapi.live_migration(self.context,
-                host=instance['host'], instance=instance, dest=dest,
-                block_migration=block_migration, migrate_data={})
-
-        self.mox.ReplayAll()
-        self.driver.schedule_live_migration(self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-
-    def test_live_migration_all_checks_pass(self):
-        # Test live migration when all checks pass.
-
-        self.mox.StubOutWithMock(servicegroup.API, 'service_is_up')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-        self.mox.StubOutWithMock(rpc, 'call')
-        self.mox.StubOutWithMock(self.driver.compute_rpcapi,
-                                 'live_migration')
-
-        dest = 'fake_host2'
-        block_migration = True
-        disk_over_commit = True
-        instance = jsonutils.to_primitive(self._live_migration_instance())
-
-        # Source checks
-        db.service_get_by_compute_host(self.context,
-                instance['host']).AndReturn('fake_service2')
-        self.servicegroup_api.service_is_up('fake_service2').AndReturn(True)
-
-        # Destination checks (compute is up, enough memory, disk)
-        db.service_get_by_compute_host(self.context,
-                dest).AndReturn('fake_service3')
-        self.servicegroup_api.service_is_up('fake_service3').AndReturn(True)
-        # assert_compute_node_has_enough_memory()
-        db.service_get_by_compute_host(self.context, dest).AndReturn(
-                {'compute_node': [{'memory_mb': 2048,
-                                   'free_disk_gb': 512,
-                                   'local_gb_used': 512,
-                                   'free_ram_mb': 1280,
-                                   'local_gb': 1024,
-                                   'vcpus': 4,
-                                   'vcpus_used': 2,
-                                   'updated_at': None,
-                                   'hypervisor_version': 1}]})
-
-        # Common checks (same hypervisor, etc)
-        db.service_get_by_compute_host(self.context, dest).AndReturn(
-                {'compute_node': [{'hypervisor_type': 'xen',
-                                   'hypervisor_version': 1}]})
-        db.service_get_by_compute_host(self.context,
-            instance['host']).AndReturn(
-                    {'compute_node': [{'hypervisor_type': 'xen',
-                                       'hypervisor_version': 1,
-                                       'cpu_info': 'fake_cpu_info'}]})
-
-        rpc.call(self.context, "compute.fake_host2",
-                   {"method": 'check_can_live_migrate_destination',
-                    "namespace": None,
-                    "args": {'instance': instance,
-                             'block_migration': block_migration,
-                             'disk_over_commit': disk_over_commit},
-                    "version": compute_rpcapi.ComputeAPI.BASE_RPC_API_VERSION},
-                 None).AndReturn({})
-
-        self.driver.compute_rpcapi.live_migration(self.context,
-                host=instance['host'], instance=instance, dest=dest,
-                block_migration=block_migration, migrate_data={})
-
-        self.mox.ReplayAll()
-        result = self.driver.schedule_live_migration(self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-        self.assertEqual(result, None)
-
-    def test_live_migration_instance_not_running(self):
-        # The instance given by instance_id is not running.
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = self._live_migration_instance()
-        instance['power_state'] = power_state.NOSTATE
-
-        self.assertRaises(exception.InstanceNotRunning,
-            self.driver.schedule_live_migration, self.context,
-                    instance=instance, dest=dest,
-                    block_migration=block_migration,
-                    disk_over_commit=disk_over_commit)
-
-    def test_live_migration_compute_src_not_exist(self):
-        # Raise exception when src compute node is does not exist.
-
-        self.mox.StubOutWithMock(servicegroup.API, 'service_is_up')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = self._live_migration_instance()
-
-        # Compute down
-        db.service_get_by_compute_host(self.context,
-                instance['host']).AndRaise(
-                        exception.ComputeHostNotFound(host='fake'))
-
-        self.mox.ReplayAll()
-        self.assertRaises(exception.ComputeServiceUnavailable,
-                self.driver.schedule_live_migration, self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-
-    def test_live_migration_compute_src_not_alive(self):
-        # Raise exception when src compute node is not alive.
-
-        self.mox.StubOutWithMock(servicegroup.API, 'service_is_up')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = self._live_migration_instance()
-
-        # Compute down
-        db.service_get_by_compute_host(self.context,
-                instance['host']).AndReturn('fake_service2')
-        self.servicegroup_api.service_is_up('fake_service2').AndReturn(False)
-
-        self.mox.ReplayAll()
-        self.assertRaises(exception.ComputeServiceUnavailable,
-                self.driver.schedule_live_migration, self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-
-    def test_live_migration_compute_dest_not_exist(self):
-        # Raise exception when dest compute node does not exist.
-
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = self._live_migration_instance()
-
-        self.driver._live_migration_src_check(self.context, instance)
-        # Compute down
-        db.service_get_by_compute_host(self.context,
-                            dest).AndRaise(exception.NotFound())
-
-        self.mox.ReplayAll()
-        self.assertRaises(exception.ComputeServiceUnavailable,
-                self.driver.schedule_live_migration, self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-
-    def test_live_migration_compute_dest_not_alive(self):
-        # Raise exception when dest compute node is not alive.
-
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-        self.mox.StubOutWithMock(servicegroup.API, 'service_is_up')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = self._live_migration_instance()
-
-        self.driver._live_migration_src_check(self.context, instance)
-        db.service_get_by_compute_host(self.context,
-                dest).AndReturn('fake_service3')
-        # Compute is down
-        self.servicegroup_api.service_is_up('fake_service3').AndReturn(False)
-
-        self.mox.ReplayAll()
-        self.assertRaises(exception.ComputeServiceUnavailable,
-                self.driver.schedule_live_migration, self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-
-    def test_live_migration_dest_check_service_same_host(self):
-        # Confirms exception raises in case dest and src is same host.
-
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        block_migration = False
-        instance = self._live_migration_instance()
-        # make dest same as src
-        dest = instance['host']
-
-        self.driver._live_migration_src_check(self.context, instance)
-
-        self.mox.ReplayAll()
-        self.assertRaises(exception.UnableToMigrateToSelf,
-                self.driver.schedule_live_migration, self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=False)
-
-    def test_live_migration_dest_check_service_lack_memory(self):
-        # Confirms exception raises when dest doesn't have enough memory.
-
-        # Flag needed to make FilterScheduler test hit memory limit since the
-        # default for it is to allow memory overcommit by a factor of 1.5.
-        self.flags(ram_allocation_ratio=1.0)
-
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-        self.mox.StubOutWithMock(servicegroup.API, 'service_is_up')
-        self.mox.StubOutWithMock(self.driver, '_get_compute_info')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = self._live_migration_instance()
-
-        self.driver._live_migration_src_check(self.context, instance)
-        db.service_get_by_compute_host(self.context,
-                dest).AndReturn('fake_service3')
-        self.servicegroup_api.service_is_up('fake_service3').AndReturn(True)
-
-        self.driver._get_compute_info(self.context, dest).AndReturn(
-                                                       {'memory_mb': 2048,
-                                                        'free_disk_gb': 512,
-                                                        'local_gb_used': 512,
-                                                        'free_ram_mb': 512,
-                                                        'local_gb': 1024,
-                                                        'vcpus': 4,
-                                                        'vcpus_used': 2,
-                                                        'updated_at': None})
-
-        self.mox.ReplayAll()
-        self.assertRaises(exception.MigrationError,
-                self.driver.schedule_live_migration, self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-
-    def test_live_migration_different_hypervisor_type_raises(self):
-        # Confirm live_migration to hypervisor of different type raises.
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        self.mox.StubOutWithMock(self.driver, '_live_migration_dest_check')
-        self.mox.StubOutWithMock(rpc, 'queue_get_for')
-        self.mox.StubOutWithMock(rpc, 'call')
-        self.mox.StubOutWithMock(rpc, 'cast')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = self._live_migration_instance()
-
-        self.driver._live_migration_src_check(self.context, instance)
-        self.driver._live_migration_dest_check(self.context, instance,
-                                               dest).AndReturn(dest)
-
-        db.service_get_by_compute_host(self.context, dest).AndReturn(
-                {'compute_node': [{'hypervisor_type': 'xen',
-                                   'hypervisor_version': 1}]})
-        db.service_get_by_compute_host(self.context,
-            instance['host']).AndReturn(
-                    {'compute_node': [{'hypervisor_type': 'not-xen',
-                                       'hypervisor_version': 1}]})
-
-        self.mox.ReplayAll()
-        self.assertRaises(exception.InvalidHypervisorType,
-                self.driver.schedule_live_migration, self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-
-    def test_live_migration_dest_hypervisor_version_older_raises(self):
-        # Confirm live migration to older hypervisor raises.
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        self.mox.StubOutWithMock(self.driver, '_live_migration_dest_check')
-        self.mox.StubOutWithMock(rpc, 'queue_get_for')
-        self.mox.StubOutWithMock(rpc, 'call')
-        self.mox.StubOutWithMock(rpc, 'cast')
-        self.mox.StubOutWithMock(db, 'service_get_by_compute_host')
-
-        dest = 'fake_host2'
-        block_migration = False
-        disk_over_commit = False
-        instance = self._live_migration_instance()
-
-        self.driver._live_migration_src_check(self.context, instance)
-        self.driver._live_migration_dest_check(self.context, instance,
-                                               dest).AndReturn(dest)
-
-        db.service_get_by_compute_host(self.context, dest).AndReturn(
-                {'compute_node': [{'hypervisor_type': 'xen',
-                                    'hypervisor_version': 1}]})
-        db.service_get_by_compute_host(self.context,
-            instance['host']).AndReturn(
-                    {'compute_node': [{'hypervisor_type': 'xen',
-                                       'hypervisor_version': 2}]})
-        self.mox.ReplayAll()
-        self.assertRaises(exception.DestinationHypervisorTooOld,
-                self.driver.schedule_live_migration, self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-
-    def test_live_migration_dest_check_auto_set_host(self):
-        instance = self._live_migration_instance()
-
-        # Confirm dest is picked by scheduler if not set.
-        self.mox.StubOutWithMock(self.driver, 'select_hosts')
-        self.mox.StubOutWithMock(flavors, 'extract_flavor')
-
-        request_spec = {'instance_properties': instance,
-                        'instance_type': {},
-                        'instance_uuids': [instance['uuid']],
-                        'image': self.image_service.show(self.context,
-                                                         instance['image_ref'])
-                        }
-        ignore_hosts = [instance['host']]
-        filter_properties = {'ignore_hosts': ignore_hosts}
-
-        flavors.extract_flavor(instance).AndReturn({})
-        self.driver.select_hosts(self.context, request_spec,
-                                 filter_properties).AndReturn(['fake_host2'])
-
-        self.mox.ReplayAll()
-        result = self.driver._live_migration_dest_check(self.context, instance,
-                                                        None, ignore_hosts)
-        self.assertEqual('fake_host2', result)
-
-    def test_live_migration_dest_check_no_image(self):
-        instance = self._live_migration_instance()
-        instance['image_ref'] = ''
-
-        # Confirm dest is picked by scheduler if not set.
-        self.mox.StubOutWithMock(self.driver, 'select_hosts')
-        self.mox.StubOutWithMock(flavors, 'extract_flavor')
-
-        request_spec = {'instance_properties': instance,
-                        'instance_type': {},
-                        'instance_uuids': [instance['uuid']],
-                        'image': None
-                        }
-        ignore_hosts = [instance['host']]
-        filter_properties = {'ignore_hosts': ignore_hosts}
-
-        flavors.extract_flavor(instance).AndReturn({})
-        self.driver.select_hosts(self.context, request_spec,
-                                 filter_properties).AndReturn(['fake_host2'])
-
-        self.mox.ReplayAll()
-        result = self.driver._live_migration_dest_check(self.context, instance,
-                                                        None, ignore_hosts)
-        self.assertEqual('fake_host2', result)
-
-    def test_live_migration_auto_set_dest(self):
-        instance = self._live_migration_instance()
-
-        # Confirm scheduler picks target host if none given.
-        self.mox.StubOutWithMock(flavors, 'extract_flavor')
-        self.mox.StubOutWithMock(self.driver, '_live_migration_src_check')
-        self.mox.StubOutWithMock(self.driver, 'select_hosts')
-        self.mox.StubOutWithMock(self.driver, '_live_migration_common_check')
-        self.mox.StubOutWithMock(rpc, 'call')
-        self.mox.StubOutWithMock(self.driver.compute_rpcapi, 'live_migration')
-
-        dest = None
-        block_migration = False
-        disk_over_commit = False
-        request_spec = {'instance_properties': instance,
-                        'instance_type': {},
-                        'instance_uuids': [instance['uuid']],
-                        'image': self.image_service.show(self.context,
-                                                         instance['image_ref'])
-                        }
-
-        self.driver._live_migration_src_check(self.context, instance)
-
-        flavors.extract_flavor(
-                instance).MultipleTimes().AndReturn({})
-
-        # First selected host raises exception.InvalidHypervisorType
-        self.driver.select_hosts(self.context, request_spec,
-                {'ignore_hosts': [instance['host']]}).AndReturn(['fake_host2'])
-        self.driver._live_migration_common_check(self.context, instance,
-                'fake_host2').AndRaise(exception.InvalidHypervisorType())
-
-        # Second selected host raises exception.InvalidCPUInfo
-        self.driver.select_hosts(self.context, request_spec,
-                {'ignore_hosts': [instance['host'],
-                                  'fake_host2']}).AndReturn(['fake_host3'])
-        self.driver._live_migration_common_check(self.context, instance,
-                                                 'fake_host3')
-        rpc.call(self.context, "compute.fake_host3",
-                   {"method": 'check_can_live_migrate_destination',
-                    "namespace": None,
-                    "args": {'instance': instance,
-                             'block_migration': block_migration,
-                             'disk_over_commit': disk_over_commit},
-                    "version": compute_rpcapi.ComputeAPI.BASE_RPC_API_VERSION},
-                 None).AndRaise(exception.InvalidCPUInfo(reason=""))
-
-        # Third selected host pass all checks
-        self.driver.select_hosts(self.context, request_spec,
-                {'ignore_hosts': [instance['host'],
-                                  'fake_host2',
-                                  'fake_host3']}).AndReturn(['fake_host4'])
-        self.driver._live_migration_common_check(self.context, instance,
-                                                 'fake_host4')
-        rpc.call(self.context, "compute.fake_host4",
-                   {"method": 'check_can_live_migrate_destination',
-                    "namespace": None,
-                    "args": {'instance': instance,
-                             'block_migration': block_migration,
-                             'disk_over_commit': disk_over_commit},
-                    "version": compute_rpcapi.ComputeAPI.BASE_RPC_API_VERSION},
-                 None).AndReturn({})
-        self.driver.compute_rpcapi.live_migration(self.context,
-                host=instance['host'], instance=instance, dest='fake_host4',
-                block_migration=block_migration, migrate_data={})
-
-        self.mox.ReplayAll()
-        result = self.driver.schedule_live_migration(self.context,
-                instance=instance, dest=dest,
-                block_migration=block_migration,
-                disk_over_commit=disk_over_commit)
-        self.assertEqual(result, None)
-
     def test_handle_schedule_error_adds_instance_fault(self):
         instance = {'uuid': 'fake-uuid'}
         self.mox.StubOutWithMock(db, 'instance_update_and_get_original')
@@ -961,12 +502,10 @@ class SchedulerTestCase(test.NoDBTestCase):
 
 class SchedulerDriverBaseTestCase(SchedulerTestCase):
     """Test cases for base scheduler driver class methods
-       that can't will fail if the driver is changed.
+       that will fail if the driver is changed.
     """
 
     def test_unimplemented_schedule_run_instance(self):
-        fake_args = (1, 2, 3)
-        fake_kwargs = {'cat': 'meow'}
         fake_request_spec = {'instance_properties':
                 {'uuid': 'uuid'}}
 
@@ -976,8 +515,6 @@ class SchedulerDriverBaseTestCase(SchedulerTestCase):
                          None, None)
 
     def test_unimplemented_schedule_prep_resize(self):
-        fake_args = (1, 2, 3)
-        fake_kwargs = {'cat': 'meow'}
         fake_request_spec = {'instance_properties':
                 {'uuid': 'uuid'}}
 
diff --git a/nova/tests/scheduler/test_scheduler_options.py b/nova/tests/scheduler/test_scheduler_options.py
index 6ab245ef9..eb7ccfeec 100644
--- a/nova/tests/scheduler/test_scheduler_options.py
+++ b/nova/tests/scheduler/test_scheduler_options.py
@@ -71,7 +71,6 @@ class SchedulerOptionsTestCase(test.NoDBTestCase):
         file_old = None
         file_now = datetime.datetime(2012, 1, 1, 1, 1, 1)
 
-        data = dict(a=1, b=2, c=3)
         jdata = ""
 
         fake = FakeSchedulerOptions(last_checked, now, file_old, file_now,
diff --git a/nova/tests/test_cinder.py b/nova/tests/test_cinder.py
index e8dff9a4a..98cc1c3f9 100644
--- a/nova/tests/test_cinder.py
+++ b/nova/tests/test_cinder.py
@@ -14,7 +14,6 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-import httplib2
 import urlparse
 
 from cinderclient import exceptions as cinder_exception
@@ -76,9 +75,9 @@ class FakeHTTPClient(cinder.cinder_client.client.HTTPClient):
 
         status, body = getattr(self, callback)(**kwargs)
         if hasattr(status, 'items'):
-            return httplib2.Response(status), body
+            return status, body
         else:
-            return httplib2.Response({"status": status}), body
+            return {"status": status}, body
 
     def get_volumes_1234(self, **kw):
         volume = {'volume': _stub_volume(id='1234')}
diff --git a/nova/tests/test_wsgi.py b/nova/tests/test_wsgi.py
index d1d659fe3..7118aa938 100644
--- a/nova/tests/test_wsgi.py
+++ b/nova/tests/test_wsgi.py
@@ -23,8 +23,7 @@ import tempfile
 import testtools
 
 import eventlet
-import httplib2
-import paste
+import requests
 
 import nova.exception
 from nova import test
@@ -119,16 +118,16 @@ class TestWSGIServer(test.TestCase):
         server.start()
 
         uri = "http://127.0.0.1:%d/%s" % (server.port, 10000 * 'x')
-        resp, _ = httplib2.Http().request(uri)
+        resp = requests.get(uri)
         eventlet.sleep(0)
-        self.assertNotEqual(resp.status,
-                            paste.httpexceptions.HTTPRequestURITooLong.code)
+        self.assertNotEqual(resp.status_code,
+                            requests.codes.REQUEST_URI_TOO_LARGE)
 
         uri = "http://127.0.0.1:%d/%s" % (server.port, 20000 * 'x')
-        resp, _ = httplib2.Http().request(uri)
+        resp = requests.get(uri)
         eventlet.sleep(0)
-        self.assertEqual(resp.status,
-                         paste.httpexceptions.HTTPRequestURITooLong.code)
+        self.assertEqual(resp.status_code,
+                         requests.codes.REQUEST_URI_TOO_LARGE)
         server.stop()
         server.wait()
 
diff --git a/nova/tests/utils.py b/nova/tests/utils.py
index 994e4f220..d39d14950 100644
--- a/nova/tests/utils.py
+++ b/nova/tests/utils.py
@@ -12,7 +12,7 @@
 #    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 errno
 import platform
@@ -212,5 +212,5 @@ def is_ipv6_supported():
         if e.errno == errno.EAFNOSUPPORT:
             has_ipv6_support = False
         else:
-            raise e
+            raise
     return has_ipv6_support
diff --git a/nova/tests/virt/hyperv/test_hypervapi.py b/nova/tests/virt/hyperv/test_hypervapi.py
index cfc79c388..9f2d745ff 100644
--- a/nova/tests/virt/hyperv/test_hypervapi.py
+++ b/nova/tests/virt/hyperv/test_hypervapi.py
@@ -495,13 +495,24 @@ class HyperVAPITestCase(test.TestCase):
                                    constants.HYPERV_VM_STATE_DISABLED)
 
     def test_power_on(self):
-        self._test_vm_state_change(self._conn.power_on,
-                                   constants.HYPERV_VM_STATE_DISABLED,
-                                   constants.HYPERV_VM_STATE_ENABLED)
+        self._instance_data = self._get_instance_data()
+        network_info = fake_network.fake_get_instance_nw_info(self.stubs,
+                                                              spectacular=True)
+        vmutils.VMUtils.set_vm_state(mox.Func(self._check_instance_name),
+                                     constants.HYPERV_VM_STATE_ENABLED)
+        self._mox.ReplayAll()
+        self._conn.power_on(self._context, self._instance_data, network_info)
+        self._mox.VerifyAll()
 
     def test_power_on_already_running(self):
-        self._test_vm_state_change(self._conn.power_on, None,
-                                   constants.HYPERV_VM_STATE_ENABLED)
+        self._instance_data = self._get_instance_data()
+        network_info = fake_network.fake_get_instance_nw_info(self.stubs,
+                                                              spectacular=True)
+        vmutils.VMUtils.set_vm_state(mox.Func(self._check_instance_name),
+                                     constants.HYPERV_VM_STATE_ENABLED)
+        self._mox.ReplayAll()
+        self._conn.power_on(self._context, self._instance_data, network_info)
+        self._mox.VerifyAll()
 
     def test_reboot(self):
 
diff --git a/nova/tests/virt/libvirt/test_libvirt.py b/nova/tests/virt/libvirt/test_libvirt.py
index 3c658a7f5..2a6884483 100644
--- a/nova/tests/virt/libvirt/test_libvirt.py
+++ b/nova/tests/virt/libvirt/test_libvirt.py
@@ -26,6 +26,7 @@ import re
 import shutil
 import tempfile
 
+from eventlet import greenthread
 from lxml import etree
 from oslo.config import cfg
 from xml.dom import minidom
@@ -43,6 +44,7 @@ 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 processutils
 from nova.openstack.common import uuidutils
 from nova import test
 from nova.tests import fake_network
@@ -77,6 +79,7 @@ CONF.import_opt('compute_manager', 'nova.service')
 CONF.import_opt('host', 'nova.netconf')
 CONF.import_opt('my_ip', 'nova.netconf')
 CONF.import_opt('base_dir_name', 'nova.virt.libvirt.imagecache')
+CONF.import_opt('instances_path', 'nova.compute.manager')
 
 _fake_network_info = fake_network.fake_get_instance_nw_info
 _fake_stub_out_get_nw_info = fake_network.stub_out_nw_api_get_instance_nw_info
@@ -286,8 +289,9 @@ class LibvirtConnTestCase(test.TestCase):
         self.user_id = 'fake'
         self.project_id = 'fake'
         self.context = context.get_admin_context()
-        self.flags(instances_path='')
-        self.flags(libvirt_snapshots_directory='')
+        temp_dir = self.useFixture(fixtures.TempDir()).path
+        self.flags(instances_path=temp_dir)
+        self.flags(libvirt_snapshots_directory=temp_dir)
         self.useFixture(fixtures.MonkeyPatch(
             'nova.virt.libvirt.driver.libvirt_utils',
             fake_libvirt_utils))
@@ -343,6 +347,9 @@ class LibvirtConnTestCase(test.TestCase):
                 'extra_specs': {},
                 'system_metadata': sys_meta}
 
+    def relpath(self, path):
+        return os.path.relpath(path, CONF.instances_path)
+
     def tearDown(self):
         nova.tests.image.fake.FakeImageService_reset()
         super(LibvirtConnTestCase, self).tearDown()
@@ -2078,8 +2085,8 @@ class LibvirtConnTestCase(test.TestCase):
             else:
                 suffix = ''
             if expect_kernel:
-                check = (lambda t: t.find('./os/kernel').text.split(
-                    '/')[1], 'kernel' + suffix)
+                check = (lambda t: self.relpath(t.find('./os/kernel').text).
+                         split('/')[1], 'kernel' + suffix)
             else:
                 check = (lambda t: t.find('./os/kernel'), None)
             check_list.append(check)
@@ -2094,8 +2101,8 @@ class LibvirtConnTestCase(test.TestCase):
                 check_list.append(check)
 
             if expect_ramdisk:
-                check = (lambda t: t.find('./os/initrd').text.split(
-                    '/')[1], 'ramdisk' + suffix)
+                check = (lambda t: self.relpath(t.find('./os/initrd').text).
+                         split('/')[1], 'ramdisk' + suffix)
             else:
                 check = (lambda t: t.find('./os/initrd'), None)
             check_list.append(check)
@@ -2146,8 +2153,9 @@ class LibvirtConnTestCase(test.TestCase):
                 check = (lambda t: t.findall('./devices/serial')[1].get(
                         'type'), 'pty')
                 check_list.append(check)
-                check = (lambda t: t.findall('./devices/serial/source')[0].get(
-                        'path').split('/')[1], 'console.log')
+                check = (lambda t: self.relpath(t.findall(
+                         './devices/serial/source')[0].get('path')).
+                         split('/')[1], 'console.log')
                 check_list.append(check)
             else:
                 check = (lambda t: t.find('./devices/console').get(
@@ -2159,16 +2167,16 @@ class LibvirtConnTestCase(test.TestCase):
             (lambda t: t.find('./memory').text, '2097152')]
         if rescue:
             common_checks += [
-                (lambda t: t.findall('./devices/disk/source')[0].get(
-                    'file').split('/')[1], 'disk.rescue'),
-                (lambda t: t.findall('./devices/disk/source')[1].get(
-                    'file').split('/')[1], 'disk')]
+                (lambda t: self.relpath(t.findall('./devices/disk/source')[0].
+                    get('file')).split('/')[1], 'disk.rescue'),
+                (lambda t: self.relpath(t.findall('./devices/disk/source')[1].
+                    get('file')).split('/')[1], 'disk')]
         else:
-            common_checks += [(lambda t: t.findall(
-                './devices/disk/source')[0].get('file').split('/')[1],
+            common_checks += [(lambda t: self.relpath(t.findall(
+                './devices/disk/source')[0].get('file')).split('/')[1],
                                'disk')]
-            common_checks += [(lambda t: t.findall(
-                './devices/disk/source')[1].get('file').split('/')[1],
+            common_checks += [(lambda t: self.relpath(t.findall(
+                './devices/disk/source')[1].get('file')).split('/')[1],
                                'disk.local')]
 
         for (libvirt_type, (expected_uri, checks)) in type_uri_map.iteritems():
@@ -3165,6 +3173,90 @@ class LibvirtConnTestCase(test.TestCase):
         self.stubs.Set(os.path, 'exists', fake_os_path_exists)
         conn.destroy(instance, [], None, False)
 
+    def test_reboot_different_ids(self):
+        class FakeLoopingCall:
+            def start(self, *a, **k):
+                return self
+
+            def wait(self):
+                return None
+
+        self.flags(libvirt_wait_soft_reboot_seconds=1)
+        info_tuple = ('fake', 'fake', 'fake', 'also_fake')
+        self.reboot_create_called = False
+
+        # Mock domain
+        mock_domain = self.mox.CreateMock(libvirt.virDomain)
+        mock_domain.info().AndReturn(
+            (libvirt_driver.VIR_DOMAIN_RUNNING,) + info_tuple)
+        mock_domain.ID().AndReturn('some_fake_id')
+        mock_domain.shutdown()
+        mock_domain.info().AndReturn(
+            (libvirt_driver.VIR_DOMAIN_CRASHED,) + info_tuple)
+        mock_domain.ID().AndReturn('some_other_fake_id')
+
+        self.mox.ReplayAll()
+
+        def fake_lookup_by_name(instance_name):
+            return mock_domain
+
+        def fake_create_domain(**kwargs):
+            self.reboot_create_called = True
+
+        conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
+        instance = {"name": "instancename", "id": "instanceid",
+                    "uuid": "875a8070-d0b9-4949-8b31-104d125c9a64"}
+        self.stubs.Set(conn, '_lookup_by_name', fake_lookup_by_name)
+        self.stubs.Set(conn, '_create_domain', fake_create_domain)
+        self.stubs.Set(loopingcall, 'FixedIntervalLoopingCall',
+                       lambda *a, **k: FakeLoopingCall())
+        conn.reboot(None, instance, [])
+        self.assertTrue(self.reboot_create_called)
+
+    def test_reboot_same_ids(self):
+        class FakeLoopingCall:
+            def start(self, *a, **k):
+                return self
+
+            def wait(self):
+                return None
+
+        self.flags(libvirt_wait_soft_reboot_seconds=1)
+        info_tuple = ('fake', 'fake', 'fake', 'also_fake')
+        self.reboot_hard_reboot_called = False
+
+        # Mock domain
+        mock_domain = self.mox.CreateMock(libvirt.virDomain)
+        mock_domain.info().AndReturn(
+            (libvirt_driver.VIR_DOMAIN_RUNNING,) + info_tuple)
+        mock_domain.ID().AndReturn('some_fake_id')
+        mock_domain.shutdown()
+        mock_domain.info().AndReturn(
+            (libvirt_driver.VIR_DOMAIN_CRASHED,) + info_tuple)
+        mock_domain.ID().AndReturn('some_fake_id')
+
+        self.mox.ReplayAll()
+
+        def fake_lookup_by_name(instance_name):
+            return mock_domain
+
+        def fake_hard_reboot(*args, **kwargs):
+            self.reboot_hard_reboot_called = True
+
+        def fake_sleep(interval):
+            pass
+
+        conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), False)
+        instance = {"name": "instancename", "id": "instanceid",
+                    "uuid": "875a8070-d0b9-4949-8b31-104d125c9a64"}
+        self.stubs.Set(conn, '_lookup_by_name', fake_lookup_by_name)
+        self.stubs.Set(greenthread, 'sleep', fake_sleep)
+        self.stubs.Set(conn, '_hard_reboot', fake_hard_reboot)
+        self.stubs.Set(loopingcall, 'FixedIntervalLoopingCall',
+                       lambda *a, **k: FakeLoopingCall())
+        conn.reboot(None, instance, [])
+        self.assertTrue(self.reboot_hard_reboot_called)
+
     def test_destroy_undefines(self):
         mock = self.mox.CreateMock(libvirt.virDomain)
         mock.ID()
@@ -3931,6 +4023,88 @@ class LibvirtConnTestCase(test.TestCase):
         self.mox.ReplayAll()
         self.assertTrue(conn._is_storage_shared_with('foo', '/path'))
 
+    def test_create_domain_define_xml_fails(self):
+        """
+        Tests that the xml is logged when defining the domain fails.
+        """
+        fake_xml = "<test>this is a test</test>"
+
+        def fake_defineXML(xml):
+            self.assertEquals(fake_xml, xml)
+            raise libvirt.libvirtError('virDomainDefineXML() failed')
+
+        self.log_error_called = False
+
+        def fake_error(msg):
+            self.log_error_called = True
+            self.assertTrue(fake_xml in msg)
+
+        self.stubs.Set(nova.virt.libvirt.driver.LOG, 'error', fake_error)
+
+        self.create_fake_libvirt_mock(defineXML=fake_defineXML)
+        self.mox.ReplayAll()
+        conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
+
+        self.assertRaises(libvirt.libvirtError, conn._create_domain, fake_xml)
+        self.assertTrue(self.log_error_called)
+
+    def test_create_domain_with_flags_fails(self):
+        """
+        Tests that the xml is logged when creating the domain with flags fails.
+        """
+        fake_xml = "<test>this is a test</test>"
+        fake_domain = FakeVirtDomain(fake_xml)
+
+        def fake_createWithFlags(launch_flags):
+            raise libvirt.libvirtError('virDomainCreateWithFlags() failed')
+
+        self.log_error_called = False
+
+        def fake_error(msg):
+            self.log_error_called = True
+            self.assertTrue(fake_xml in msg)
+
+        self.stubs.Set(fake_domain, 'createWithFlags', fake_createWithFlags)
+        self.stubs.Set(nova.virt.libvirt.driver.LOG, 'error', fake_error)
+
+        self.create_fake_libvirt_mock()
+        self.mox.ReplayAll()
+        conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
+
+        self.assertRaises(libvirt.libvirtError, conn._create_domain,
+                          domain=fake_domain)
+        self.assertTrue(self.log_error_called)
+
+    def test_create_domain_enable_hairpin_fails(self):
+        """
+        Tests that the xml is logged when enabling hairpin mode for the domain
+        fails.
+        """
+        fake_xml = "<test>this is a test</test>"
+        fake_domain = FakeVirtDomain(fake_xml)
+
+        def fake_enable_hairpin(launch_flags):
+            raise processutils.ProcessExecutionError('error')
+
+        self.log_error_called = False
+
+        def fake_error(msg):
+            self.log_error_called = True
+            self.assertTrue(fake_xml in msg)
+
+        self.stubs.Set(nova.virt.libvirt.driver.LOG, 'error', fake_error)
+
+        self.create_fake_libvirt_mock()
+        self.mox.ReplayAll()
+        conn = libvirt_driver.LibvirtDriver(fake.FakeVirtAPI(), True)
+        self.stubs.Set(conn, '_enable_hairpin', fake_enable_hairpin)
+
+        self.assertRaises(processutils.ProcessExecutionError,
+                          conn._create_domain,
+                          domain=fake_domain,
+                          power_on=False)
+        self.assertTrue(self.log_error_called)
+
 
 class HostStateTestCase(test.TestCase):
 
diff --git a/nova/tests/virt/libvirt/test_libvirt_vif.py b/nova/tests/virt/libvirt/test_libvirt_vif.py
index c9c6aef12..7cbf67b07 100644
--- a/nova/tests/virt/libvirt/test_libvirt_vif.py
+++ b/nova/tests/virt/libvirt/test_libvirt_vif.py
@@ -103,6 +103,17 @@ class LibvirtVifTestCase(test.TestCase):
         'ovs_interfaceid': 'aaa-bbb-ccc',
     }
 
+    mapping_ivs = {
+        'mac': 'ca:fe:de:ad:be:ef',
+        'gateway_v6': net_ovs['gateway_v6'],
+        'ips': [{'ip': '101.168.1.9'}],
+        'dhcp_server': '191.168.1.1',
+        'vif_uuid': 'vif-xxx-yyy-zzz',
+        'vif_devname': 'tap-xxx-yyy-zzz',
+        'vif_type': network_model.VIF_TYPE_IVS,
+        'ivs_interfaceid': 'aaa-bbb-ccc',
+    }
+
     mapping_ovs_legacy = {
         'mac': 'ca:fe:de:ad:be:ef',
         'gateway_v6': net_ovs['gateway_v6'],
@@ -411,6 +422,24 @@ class LibvirtVifTestCase(test.TestCase):
                                   self.mapping_bridge_quantum,
                                   br_want)
 
+    def _check_ivs_ethernet_driver(self, d, net, mapping, dev_prefix):
+        self.flags(firewall_driver="nova.virt.firewall.NoopFirewallDriver")
+        xml = self._get_instance_xml(d, net, mapping)
+
+        doc = etree.fromstring(xml)
+        ret = doc.findall('./devices/interface')
+        self.assertEqual(len(ret), 1)
+        node = ret[0]
+        ret = node.findall("filterref")
+        self.assertEqual(len(ret), 0)
+        self.assertEqual(node.get("type"), "ethernet")
+        dev_name = node.find("target").get("dev")
+        self.assertTrue(dev_name.startswith(dev_prefix))
+        mac = node.find("mac").get("address")
+        self.assertEqual(mac, self.mapping_ivs['mac'])
+        script = node.find("script").get("path")
+        self.assertEquals(script, "")
+
     def _check_ovs_ethernet_driver(self, d, net, mapping, dev_prefix):
         self.flags(firewall_driver="nova.virt.firewall.NoopFirewallDriver")
         xml = self._get_instance_xml(d, net, mapping)
@@ -451,6 +480,33 @@ class LibvirtVifTestCase(test.TestCase):
                                         self.mapping_ovs,
                                         "tap")
 
+    def test_ivs_ethernet_driver(self):
+        def get_connection():
+            return fakelibvirt.Connection("qemu:///session",
+                                          False,
+                                          9010)
+        d = vif.LibvirtGenericVIFDriver(get_connection)
+        self._check_ivs_ethernet_driver(d,
+                                        self.net_ovs,
+                                        self.mapping_ivs,
+                                        "tap")
+
+    def _check_ivs_virtualport_driver(self, d, net, mapping, want_iface_id):
+        self.flags(firewall_driver="nova.virt.firewall.NoopFirewallDriver")
+        xml = self._get_instance_xml(d, net, mapping)
+        doc = etree.fromstring(xml)
+        ret = doc.findall('./devices/interface')
+        self.assertEqual(len(ret), 1)
+        node = ret[0]
+        ret = node.findall("filterref")
+        self.assertEqual(len(ret), 0)
+        self.assertEqual(node.get("type"), "ethernet")
+
+        tap_name = node.find("target").get("dev")
+        self.assertEqual(tap_name, mapping['vif_devname'])
+        mac = node.find("mac").get("address")
+        self.assertEqual(mac, mapping['mac'])
+
     def _check_ovs_virtualport_driver(self, d, net, mapping, want_iface_id):
         self.flags(firewall_driver="nova.virt.firewall.NoopFirewallDriver")
         xml = self._get_instance_xml(d, net, mapping)
@@ -502,6 +558,18 @@ class LibvirtVifTestCase(test.TestCase):
                                            self.mapping_ovs,
                                            want_iface_id)
 
+    def test_generic_ivs_virtualport_driver(self):
+        def get_connection():
+            return fakelibvirt.Connection("qemu:///session",
+                                          False,
+                                          9011)
+        d = vif.LibvirtGenericVIFDriver(get_connection)
+        want_iface_id = self.mapping_ivs['ivs_interfaceid']
+        self._check_ivs_virtualport_driver(d,
+                                           self.net_ovs,
+                                           self.mapping_ivs,
+                                           want_iface_id)
+
     def _check_quantum_hybrid_driver(self, d, net, mapping, br_want):
         self.flags(firewall_driver="nova.virt.firewall.IptablesFirewallDriver")
         xml = self._get_instance_xml(d, net, mapping)
@@ -542,6 +610,18 @@ class LibvirtVifTestCase(test.TestCase):
                                           self.mapping_ovs,
                                           br_want)
 
+    def test_ivs_hybrid_driver(self):
+        def get_connection():
+            return fakelibvirt.Connection("qemu:///session",
+                                          False)
+        d = vif.LibvirtGenericVIFDriver(get_connection)
+        br_want = "qbr" + self.mapping_ivs['vif_uuid']
+        br_want = br_want[:network_model.NIC_NAME_LEN]
+        self._check_quantum_hybrid_driver(d,
+                                          self.net_ovs,
+                                          self.mapping_ivs,
+                                          br_want)
+
     def test_generic_8021qbh_driver(self):
         def get_connection():
             return fakelibvirt.Connection("qemu:///session",
diff --git a/nova/tests/virt/test_virt_drivers.py b/nova/tests/virt/test_virt_drivers.py
index 47f983258..a21993597 100644
--- a/nova/tests/virt/test_virt_drivers.py
+++ b/nova/tests/virt/test_virt_drivers.py
@@ -60,7 +60,7 @@ class _FakeDriverBackendTestCase(object):
         # So that the _supports_direct_io does the test based
         # on the current working directory, instead of the
         # default instances_path which doesn't exist
-        self.flags(instances_path='')
+        self.flags(instances_path=self.useFixture(fixtures.TempDir()).path)
 
         # Put fakelibvirt in place
         if 'libvirt' in sys.modules:
@@ -311,13 +311,14 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase):
     @catch_notimplementederror
     def test_power_on_running(self):
         instance_ref, network_info = self._get_running_instance()
-        self.connection.power_on(instance_ref)
+        self.connection.power_on(self.ctxt, instance_ref,
+                                 network_info, None)
 
     @catch_notimplementederror
     def test_power_on_powered_off(self):
         instance_ref, network_info = self._get_running_instance()
         self.connection.power_off(instance_ref)
-        self.connection.power_on(instance_ref)
+        self.connection.power_on(self.ctxt, instance_ref, network_info, None)
 
     @catch_notimplementederror
     def test_soft_delete(self):
@@ -407,7 +408,24 @@ class _VirtDriverTestCase(_FakeDriverBackendTestCase):
         self.connection.attach_volume({'driver_volume_type': 'fake'},
                                       instance_ref,
                                       '/dev/sda')
-        self.connection.power_on(instance_ref)
+
+        bdm = {
+            'root_device_name': None,
+            'swap': None,
+            'ephemerals': [],
+            'block_device_mapping': [{
+            'instance_uuid': instance_ref['uuid'],
+            'connection_info': {'driver_volume_type': 'fake'},
+            'mount_device': '/dev/sda',
+            'delete_on_termination': False,
+            'virtual_name': None,
+            'snapshot_id': None,
+            'volume_id': 'abcdedf',
+            'volume_size': None,
+            'no_device': None
+            }]
+        }
+        self.connection.power_on(self.ctxt, instance_ref, network_info, bdm)
         self.connection.detach_volume({'driver_volume_type': 'fake'},
                                       instance_ref,
                                       '/dev/sda')
diff --git a/nova/tests/virt/vmwareapi/test_vmwareapi.py b/nova/tests/virt/vmwareapi/test_vmwareapi.py
index 5ba2f98af..62db10535 100644
--- a/nova/tests/virt/vmwareapi/test_vmwareapi.py
+++ b/nova/tests/virt/vmwareapi/test_vmwareapi.py
@@ -335,14 +335,14 @@ class VMwareAPIVMTestCase(test.TestCase):
         self.conn.power_off(self.instance)
         info = self.conn.get_info({'uuid': 'fake-uuid'})
         self._check_vm_info(info, power_state.SHUTDOWN)
-        self.conn.power_on(self.instance)
+        self.conn.power_on(self.context, self.instance, self.network_info)
         info = self.conn.get_info({'uuid': 'fake-uuid'})
         self._check_vm_info(info, power_state.RUNNING)
 
     def test_power_on_non_existent(self):
         self._create_instance_in_the_db()
         self.assertRaises(exception.InstanceNotFound, self.conn.power_on,
-                          self.instance)
+                          self.context, self.instance, self.network_info)
 
     def test_power_off(self):
         self._create_vm()
@@ -427,7 +427,7 @@ class VMwareAPIVMTestCase(test.TestCase):
             self.assertEquals(4, step)
             self.assertEqual(vmops.RESIZE_TOTAL_STEPS, total_steps)
 
-        self.stubs.Set(self.conn._vmops, "power_on", fake_power_on)
+        self.stubs.Set(self.conn._vmops, "_power_on", fake_power_on)
         self.stubs.Set(self.conn._vmops, "_update_instance_progress",
                        fake_vmops_update_instance_progress)
 
@@ -439,6 +439,7 @@ class VMwareAPIVMTestCase(test.TestCase):
                                    instance=self.instance,
                                    disk_info=None,
                                    network_info=None,
+                                   block_device_info=None,
                                    image_meta=None,
                                    power_on=power_on)
         # verify the results
@@ -475,15 +476,20 @@ class VMwareAPIVMTestCase(test.TestCase):
             self.assertEquals(self.vm_name, vm_name)
             return vmwareapi_fake._get_objects("VirtualMachine")[0]
 
+        def fake_get_vm_ref_from_uuid(session, vm_uuid):
+            return vmwareapi_fake._get_objects("VirtualMachine")[0]
+
         def fake_call_method(*args, **kwargs):
             pass
 
         def fake_wait_for_task(*args, **kwargs):
             pass
 
-        self.stubs.Set(self.conn._vmops, "power_on", fake_power_on)
+        self.stubs.Set(self.conn._vmops, "_power_on", fake_power_on)
         self.stubs.Set(self.conn._vmops, "_get_orig_vm_name_label",
                        fake_get_orig_vm_name_label)
+        self.stubs.Set(vm_util, "get_vm_ref_from_uuid",
+                       fake_get_vm_ref_from_uuid)
         self.stubs.Set(vm_util, "get_vm_ref_from_name",
                        fake_get_vm_ref_from_name)
         self.stubs.Set(self.conn._session, "_call_method", fake_call_method)
diff --git a/nova/tests/virt/xenapi/test_vm_utils.py b/nova/tests/virt/xenapi/test_vm_utils.py
index 68caab651..6884ab5a8 100644
--- a/nova/tests/virt/xenapi/test_vm_utils.py
+++ b/nova/tests/virt/xenapi/test_vm_utils.py
@@ -266,7 +266,7 @@ class FetchVhdImageTestCase(test.TestCase):
         self._apply_stubouts()
         self._common_params_setup(True)
 
-        vm_utils._add_bittorrent_params(self.params)
+        vm_utils._add_bittorrent_params(self.image_id, self.params)
 
         vm_utils._fetch_using_dom0_plugin_with_retry(self.context,
             self.session, self.image_id, "bittorrent", self.params,
@@ -289,7 +289,7 @@ class FetchVhdImageTestCase(test.TestCase):
         self._common_params_setup(True)
         self.mox.StubOutWithMock(self.session, 'call_xenapi')
 
-        vm_utils._add_bittorrent_params(self.params)
+        vm_utils._add_bittorrent_params(self.image_id, self.params)
 
         vm_utils._fetch_using_dom0_plugin_with_retry(self.context,
             self.session, self.image_id, "bittorrent", self.params,
diff --git a/nova/utils.py b/nova/utils.py
index 5e968bd35..da14d019c 100644
--- a/nova/utils.py
+++ b/nova/utils.py
@@ -95,6 +95,14 @@ BYTE_MULTIPLIERS = {
     'k': 1024,
 }
 
+# used in limits
+TIME_UNITS = {
+    'SECOND': 1,
+    'MINUTE': 60,
+    'HOUR': 3600,
+    'DAY': 84400
+}
+
 synchronized = lockutils.synchronized_with_prefix('nova-')
 
 
@@ -1050,3 +1058,13 @@ def spawn_n(func, *args, **kwargs):
     interfering with the service spawns.
     """
     eventlet.spawn_n(func, *args, **kwargs)
+
+
+def is_none_string(val):
+    """
+    Check if a string represents a None value.
+    """
+    if not isinstance(val, basestring):
+        return False
+
+    return val.lower() == 'none'
diff --git a/nova/virt/baremetal/db/sqlalchemy/api.py b/nova/virt/baremetal/db/sqlalchemy/api.py
index 5c9c35184..3c140556e 100644
--- a/nova/virt/baremetal/db/sqlalchemy/api.py
+++ b/nova/virt/baremetal/db/sqlalchemy/api.py
@@ -297,8 +297,7 @@ def bm_interface_set_vif_uuid(context, if_id, vif_uuid):
             if str(e).find('IntegrityError') != -1:
                 raise exception.NovaException(_("Baremetal interface %s "
                         "already in use") % vif_uuid)
-            else:
-                raise e
+            raise
 
 
 @sqlalchemy_api.require_admin_context
diff --git a/nova/virt/baremetal/driver.py b/nova/virt/baremetal/driver.py
index 4e8543c3e..703cc0980 100755
--- a/nova/virt/baremetal/driver.py
+++ b/nova/virt/baremetal/driver.py
@@ -250,7 +250,8 @@ class BareMetalDriver(driver.ComputeDriver):
                         )
             self.driver.activate_bootloader(context, node, instance,
                                             network_info=network_info)
-            self.power_on(instance, node)
+            self.power_on(context, instance, network_info, block_device_info,
+                          node)
             self.driver.activate_node(context, node, instance)
             _update_state(context, node, instance, baremetal_states.ACTIVE)
         except Exception:
@@ -331,7 +332,8 @@ class BareMetalDriver(driver.ComputeDriver):
                 "for instance %r") % instance['uuid'])
         pm.stop_console()
 
-    def power_on(self, instance, node=None):
+    def power_on(self, context, instance, network_info, block_device_info=None,
+                 node=None):
         """Power on the specified instance."""
         if not node:
             node = _get_baremetal_node_by_instance_uuid(instance['uuid'])
diff --git a/nova/virt/disk/vfs/localfs.py b/nova/virt/disk/vfs/localfs.py
index 10b9a1aa8..735481340 100644
--- a/nova/virt/disk/vfs/localfs.py
+++ b/nova/virt/disk/vfs/localfs.py
@@ -18,6 +18,7 @@ import os
 import tempfile
 
 from nova import exception
+from nova.openstack.common import excutils
 from nova.openstack.common import log as logging
 from nova import utils
 from nova.virt.disk.mount import loop
@@ -77,10 +78,9 @@ class VFSLocalFS(vfs.VFS):
                 raise exception.NovaException(mount.error)
             self.mount = mount
         except Exception as e:
-            LOG.debug(_("Failed to mount image %(ex)s)") %
-                      {'ex': str(e)})
-            self.teardown()
-            raise e
+            with excutils.save_and_reraise_exception():
+                LOG.debug(_("Failed to mount image %(ex)s)"), {'ex': str(e)})
+                self.teardown()
 
     def teardown(self):
         try:
diff --git a/nova/virt/driver.py b/nova/virt/driver.py
index fbc2a5640..7b2185f52 100755
--- a/nova/virt/driver.py
+++ b/nova/virt/driver.py
@@ -425,7 +425,8 @@ class ComputeDriver(object):
         """Power off the specified instance."""
         raise NotImplementedError()
 
-    def power_on(self, instance):
+    def power_on(self, context, instance, network_info,
+                 block_device_info=None):
         """Power on the specified instance."""
         raise NotImplementedError()
 
diff --git a/nova/virt/fake.py b/nova/virt/fake.py
index 801c8e827..1d8943101 100755
--- a/nova/virt/fake.py
+++ b/nova/virt/fake.py
@@ -182,7 +182,7 @@ class FakeDriver(driver.ComputeDriver):
     def power_off(self, instance):
         pass
 
-    def power_on(self, instance):
+    def power_on(self, context, instance, network_info, block_device_info):
         pass
 
     def soft_delete(self, instance):
diff --git a/nova/virt/hyperv/driver.py b/nova/virt/hyperv/driver.py
index 675f36f54..e0f533db6 100755
--- a/nova/virt/hyperv/driver.py
+++ b/nova/virt/hyperv/driver.py
@@ -103,7 +103,8 @@ class HyperVDriver(driver.ComputeDriver):
     def power_off(self, instance):
         self._vmops.power_off(instance)
 
-    def power_on(self, instance):
+    def power_on(self, context, instance, network_info,
+                 block_device_info=None):
         self._vmops.power_on(instance)
 
     def live_migration(self, context, instance_ref, dest, post_method,
diff --git a/nova/virt/libvirt/driver.py b/nova/virt/libvirt/driver.py
index 3b70952d7..4544d35fb 100755
--- a/nova/virt/libvirt/driver.py
+++ b/nova/virt/libvirt/driver.py
@@ -1208,6 +1208,18 @@ class LibvirtDriver(driver.ComputeDriver):
                                 REQ_HYPERVISOR_LIVESNAPSHOT) \
                 and not source_format == "lvm":
             live_snapshot = True
+            # Abort is an idempotent operation, so make sure any block
+            # jobs which may have failed are ended. This operation also
+            # confims the running instance, as opposed to the system as a
+            # whole, has a new enough version of the hypervisor (bug 1193146).
+            try:
+                virt_dom.blockJobAbort(disk_path, 0)
+            except libvirt.libvirtError as ex:
+                error_code = ex.get_error_code()
+                if error_code == libvirt.VIR_ERR_CONFIG_UNSUPPORTED:
+                    live_snapshot = False
+                else:
+                    pass
         else:
             live_snapshot = False
 
@@ -1279,13 +1291,6 @@ class LibvirtDriver(driver.ComputeDriver):
         # Save a copy of the domain's running XML file
         xml = domain.XMLDesc(0)
 
-        # Abort is an idempotent operation, so make sure any block
-        # jobs which may have failed are ended.
-        try:
-            domain.blockJobAbort(disk_path, 0)
-        except Exception:
-            pass
-
         def _wait_for_block_job(domain, disk_path):
             status = domain.blockJobInfo(disk_path, 0)
             try:
@@ -1381,19 +1386,22 @@ class LibvirtDriver(driver.ComputeDriver):
             state = LIBVIRT_POWER_STATE[state]
             new_domid = dom.ID()
 
-            if state in [power_state.SHUTDOWN,
-                         power_state.CRASHED]:
-                LOG.info(_("Instance shutdown successfully."),
-                         instance=instance)
-                self._create_domain(domain=dom)
-                timer = loopingcall.FixedIntervalLoopingCall(
-                    self._wait_for_running, instance)
-                timer.start(interval=0.5).wait()
-                return True
-            elif old_domid != new_domid:
-                LOG.info(_("Instance may have been rebooted during soft "
-                           "reboot, so return now."), instance=instance)
-                return True
+            # NOTE(ivoks): By checking domain IDs, we make sure we are
+            #              not recreating domain that's already running.
+            if old_domid != new_domid:
+                if state in [power_state.SHUTDOWN,
+                             power_state.CRASHED]:
+                    LOG.info(_("Instance shutdown successfully."),
+                             instance=instance)
+                    self._create_domain(domain=dom)
+                    timer = loopingcall.FixedIntervalLoopingCall(
+                        self._wait_for_running, instance)
+                    timer.start(interval=0.5).wait()
+                    return True
+                else:
+                    LOG.info(_("Instance may have been rebooted during soft "
+                               "reboot, so return now."), instance=instance)
+                    return True
             greenthread.sleep(1)
         return False
 
@@ -1460,13 +1468,13 @@ class LibvirtDriver(driver.ComputeDriver):
         """Power off the specified instance."""
         self._destroy(instance)
 
-    def power_on(self, instance):
+    def power_on(self, context, instance, network_info,
+                 block_device_info=None):
         """Power on the specified instance."""
-        dom = self._lookup_by_name(instance['name'])
-        self._create_domain(domain=dom, instance=instance)
-        timer = loopingcall.FixedIntervalLoopingCall(self._wait_for_running,
-                                                     instance)
-        timer.start(interval=0.5).wait()
+        # We use _hard_reboot here to ensure that all backing files,
+        # network, and block device connections, etc. are established
+        # and available before we attempt to start the instance.
+        self._hard_reboot(context, instance, network_info, block_device_info)
 
     def suspend(self, instance):
         """Suspend the specified instance."""
@@ -2498,10 +2506,28 @@ class LibvirtDriver(driver.ComputeDriver):
                                  use_cow=CONF.use_cow_images)
 
         if xml:
-            domain = self._conn.defineXML(xml)
+            try:
+                domain = self._conn.defineXML(xml)
+            except Exception as e:
+                LOG.error(_("An error occurred while trying to define a domain"
+                            " with xml: %s") % xml)
+                raise e
+
         if power_on:
-            domain.createWithFlags(launch_flags)
-        self._enable_hairpin(domain.XMLDesc(0))
+            try:
+                domain.createWithFlags(launch_flags)
+            except Exception as e:
+                with excutils.save_and_reraise_exception():
+                    LOG.error(_("An error occurred while trying to launch a "
+                                "defined domain with xml: %s") %
+                              domain.XMLDesc(0))
+
+        try:
+            self._enable_hairpin(domain.XMLDesc(0))
+        except Exception:
+            with excutils.save_and_reraise_exception():
+                LOG.error(_("An error occurred while enabling hairpin mode on "
+                            "domain with xml: %s") % domain.XMLDesc(0))
 
         # NOTE(uni): Now the container is running with its own private mount
         # namespace and so there is no need to keep the container rootfs
diff --git a/nova/virt/libvirt/vif.py b/nova/virt/libvirt/vif.py
index d0a2283e7..9b33a12fe 100644
--- a/nova/virt/libvirt/vif.py
+++ b/nova/virt/libvirt/vif.py
@@ -228,6 +228,36 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
                                                 mapping,
                                                 image_meta)
 
+    def get_config_ivs_hybrid(self, instance, network, mapping, image_meta):
+        newnet = copy.deepcopy(network)
+        newnet['bridge'] = self.get_br_name(mapping['vif_uuid'])
+        return self.get_config_bridge(instance,
+                                      newnet,
+                                      mapping,
+                                      image_meta)
+
+    def get_config_ivs_ethernet(self, instance, network, mapping, image_meta):
+        conf = super(LibvirtGenericVIFDriver,
+                     self).get_config(instance,
+                                      network,
+                                      mapping,
+                                      image_meta)
+
+        dev = self.get_vif_devname(mapping)
+        designer.set_vif_host_backend_ethernet_config(conf, dev)
+
+        return conf
+
+    def get_config_ivs(self, instance, network, mapping, image_meta):
+        if self.get_firewall_required():
+            return self.get_config_ivs_hybrid(instance, network,
+                                              mapping,
+                                              image_meta)
+        else:
+            return self.get_config_ivs_ethernet(instance, network,
+                                                mapping,
+                                                image_meta)
+
     def get_config_802qbg(self, instance, network, mapping, image_meta):
         conf = super(LibvirtGenericVIFDriver,
                      self).get_config(instance,
@@ -271,8 +301,7 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
             raise exception.NovaException(
                 _("vif_type parameter must be present "
                   "for this vif_driver implementation"))
-
-        if vif_type == network_model.VIF_TYPE_BRIDGE:
+        elif vif_type == network_model.VIF_TYPE_BRIDGE:
             return self.get_config_bridge(instance,
                                           network, mapping,
                                           image_meta)
@@ -288,6 +317,10 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
             return self.get_config_802qbh(instance,
                                           network, mapping,
                                           image_meta)
+        elif vif_type == network_model.VIF_TYPE_IVS:
+            return self.get_config_ivs(instance,
+                                       network, mapping,
+                                       image_meta)
         else:
             raise exception.NovaException(
                 _("Unexpected vif_type=%s") % vif_type)
@@ -372,6 +405,51 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
         else:
             self.plug_ovs_ethernet(instance, vif)
 
+    def plug_ivs_ethernet(self, instance, vif):
+        super(LibvirtGenericVIFDriver,
+              self).plug(instance, vif)
+
+        network, mapping = vif
+        iface_id = self.get_ovs_interfaceid(mapping)
+        dev = self.get_vif_devname(mapping)
+        linux_net.create_tap_dev(dev)
+        linux_net.create_ivs_vif_port(dev, iface_id, mapping['mac'],
+                                      instance['uuid'])
+
+    def plug_ivs_hybrid(self, instance, vif):
+        """Plug using hybrid strategy (same as OVS)
+
+        Create a per-VIF linux bridge, then link that bridge to the OVS
+        integration bridge via a veth device, setting up the other end
+        of the veth device just like a normal IVS port.  Then boot the
+        VIF on the linux bridge using standard libvirt mechanisms.
+        """
+        super(LibvirtGenericVIFDriver,
+              self).plug(instance, vif)
+
+        network, mapping = vif
+        iface_id = self.get_ovs_interfaceid(mapping)
+        br_name = self.get_br_name(mapping['vif_uuid'])
+        v1_name, v2_name = self.get_veth_pair_names(mapping['vif_uuid'])
+
+        if not linux_net.device_exists(br_name):
+            utils.execute('brctl', 'addbr', br_name, run_as_root=True)
+            utils.execute('brctl', 'setfd', br_name, 0, run_as_root=True)
+            utils.execute('brctl', 'stp', br_name, 'off', run_as_root=True)
+
+        if not linux_net.device_exists(v2_name):
+            linux_net._create_veth_pair(v1_name, v2_name)
+            utils.execute('ip', 'link', 'set', br_name, 'up', run_as_root=True)
+            utils.execute('brctl', 'addif', br_name, v1_name, run_as_root=True)
+            linux_net.create_ivs_vif_port(v2_name, iface_id, mapping['mac'],
+                                          instance['uuid'])
+
+    def plug_ivs(self, instance, vif):
+        if self.get_firewall_required():
+            self.plug_ivs_hybrid(instance, vif)
+        else:
+            self.plug_ivs_ethernet(instance, vif)
+
     def plug_802qbg(self, instance, vif):
         super(LibvirtGenericVIFDriver,
               self).plug(instance, vif)
@@ -393,8 +471,7 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
             raise exception.NovaException(
                 _("vif_type parameter must be present "
                   "for this vif_driver implementation"))
-
-        if vif_type == network_model.VIF_TYPE_BRIDGE:
+        elif vif_type == network_model.VIF_TYPE_BRIDGE:
             self.plug_bridge(instance, vif)
         elif vif_type == network_model.VIF_TYPE_OVS:
             self.plug_ovs(instance, vif)
@@ -402,6 +479,8 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
             self.plug_802qbg(instance, vif)
         elif vif_type == network_model.VIF_TYPE_802_QBH:
             self.plug_802qbh(instance, vif)
+        elif vif_type == network_model.VIF_TYPE_IVS:
+            self.plug_ivs(instance, vif)
         else:
             raise exception.NovaException(
                 _("Unexpected vif_type=%s") % vif_type)
@@ -460,6 +539,45 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
         else:
             self.unplug_ovs_ethernet(instance, vif)
 
+    def unplug_ivs_ethernet(self, instance, vif):
+        """Unplug the VIF by deleting the port from the bridge."""
+        super(LibvirtGenericVIFDriver,
+              self).unplug(instance, vif)
+
+        try:
+            network, mapping = vif
+            linux_net.delete_ivs_vif_port(self.get_vif_devname(mapping))
+        except exception.ProcessExecutionError:
+            LOG.exception(_("Failed while unplugging vif"), instance=instance)
+
+    def unplug_ivs_hybrid(self, instance, vif):
+        """UnPlug using hybrid strategy (same as OVS)
+
+        Unhook port from IVS, unhook port from bridge, delete
+        bridge, and delete both veth devices.
+        """
+        super(LibvirtGenericVIFDriver,
+              self).unplug(instance, vif)
+
+        try:
+            network, mapping = vif
+            br_name = self.get_br_name(mapping['vif_uuid'])
+            v1_name, v2_name = self.get_veth_pair_names(mapping['vif_uuid'])
+
+            utils.execute('brctl', 'delif', br_name, v1_name, run_as_root=True)
+            utils.execute('ip', 'link', 'set', br_name, 'down',
+                          run_as_root=True)
+            utils.execute('brctl', 'delbr', br_name, run_as_root=True)
+            linux_net.delete_ivs_vif_port(v2_name)
+        except exception.ProcessExecutionError:
+            LOG.exception(_("Failed while unplugging vif"), instance=instance)
+
+    def unplug_ivs(self, instance, vif):
+        if self.get_firewall_required():
+            self.unplug_ovs_hybrid(instance, vif)
+        else:
+            self.unplug_ovs_ethernet(instance, vif)
+
     def unplug_802qbg(self, instance, vif):
         super(LibvirtGenericVIFDriver,
               self).unplug(instance, vif)
@@ -481,8 +599,7 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
             raise exception.NovaException(
                 _("vif_type parameter must be present "
                   "for this vif_driver implementation"))
-
-        if vif_type == network_model.VIF_TYPE_BRIDGE:
+        elif vif_type == network_model.VIF_TYPE_BRIDGE:
             self.unplug_bridge(instance, vif)
         elif vif_type == network_model.VIF_TYPE_OVS:
             self.unplug_ovs(instance, vif)
@@ -490,6 +607,8 @@ class LibvirtGenericVIFDriver(LibvirtBaseVIFDriver):
             self.unplug_802qbg(instance, vif)
         elif vif_type == network_model.VIF_TYPE_802_QBH:
             self.unplug_802qbh(instance, vif)
+        elif vif_type == network_model.VIF_TYPE_IVS:
+            self.unplug_ivs(instance, vif)
         else:
             raise exception.NovaException(
                 _("Unexpected vif_type=%s") % vif_type)
diff --git a/nova/virt/powervm/driver.py b/nova/virt/powervm/driver.py
index c2cee276d..e49bbb209 100755
--- a/nova/virt/powervm/driver.py
+++ b/nova/virt/powervm/driver.py
@@ -191,7 +191,8 @@ class PowerVMDriver(driver.ComputeDriver):
         """Power off the specified instance."""
         self._powervm.power_off(instance['name'])
 
-    def power_on(self, instance):
+    def power_on(self, context, instance, network_info,
+                 block_device_info=None):
         """Power on the specified instance."""
         self._powervm.power_on(instance['name'])
 
diff --git a/nova/virt/vmwareapi/driver.py b/nova/virt/vmwareapi/driver.py
index 3cf9d32b4..1f91e5ab2 100755
--- a/nova/virt/vmwareapi/driver.py
+++ b/nova/virt/vmwareapi/driver.py
@@ -218,9 +218,10 @@ class VMwareESXDriver(driver.ComputeDriver):
         """Power off the specified instance."""
         self._vmops.power_off(instance)
 
-    def power_on(self, instance):
+    def power_on(self, context, instance, network_info,
+                 block_device_info=None):
         """Power on the specified instance."""
-        self._vmops.power_on(instance)
+        self._vmops._power_on(instance)
 
     def poll_rebooting_instances(self, timeout, instances):
         """Poll for rebooting instances."""
@@ -379,7 +380,8 @@ class VMwareVCDriver(VMwareESXDriver):
     def finish_revert_migration(self, instance, network_info,
                                 block_device_info=None, power_on=True):
         """Finish reverting a resize, powering back on the instance."""
-        self._vmops.finish_revert_migration(instance, power_on)
+        self._vmops.finish_revert_migration(instance, network_info,
+                                            block_device_info, power_on)
 
     def finish_migration(self, context, migration, instance, disk_info,
                          network_info, image_meta, resize_instance=False,
@@ -387,7 +389,7 @@ class VMwareVCDriver(VMwareESXDriver):
         """Completes a resize, turning on the migrated instance."""
         self._vmops.finish_migration(context, migration, instance, disk_info,
                                      network_info, image_meta, resize_instance,
-                                     power_on)
+                                     block_device_info, power_on)
 
     def live_migration(self, context, instance_ref, dest,
                        post_method, recover_method, block_migration=False,
diff --git a/nova/virt/vmwareapi/vmops.py b/nova/virt/vmwareapi/vmops.py
index c58aac219..1afead6b9 100644
--- a/nova/virt/vmwareapi/vmops.py
+++ b/nova/virt/vmwareapi/vmops.py
@@ -807,7 +807,7 @@ class VMwareVMOps(object):
         instance['name'] = instance['name'] + self._rescue_suffix
         self.destroy(instance, None)
         instance['name'] = instance_orig_name
-        self.power_on(instance)
+        self._power_on(instance)
 
     def power_off(self, instance):
         """Power off the specified instance."""
@@ -832,7 +832,7 @@ class VMwareVMOps(object):
             LOG.debug(_("VM was already in powered off state. So returning "
                         "without doing anything"), instance=instance)
 
-    def power_on(self, instance):
+    def _power_on(self, instance):
         """Power on the specified instance."""
         vm_ref = vm_util.get_vm_ref(self._session, instance)
 
@@ -851,6 +851,9 @@ class VMwareVMOps(object):
             self._session._wait_for_task(instance['uuid'], poweron_task)
             LOG.debug(_("Powered on the VM"), instance=instance)
 
+    def power_on(self, context, instance, network_info, block_device_info):
+        self._power_on(instance)
+
     def _get_orig_vm_name_label(self, instance):
         return instance['name'] + '-orig'
 
@@ -954,7 +957,8 @@ class VMwareVMOps(object):
         if network_info:
             self.unplug_vifs(instance, network_info)
 
-    def finish_revert_migration(self, instance, power_on=True):
+    def finish_revert_migration(self, instance, network_info,
+                                block_device_info, power_on=True):
         """Finish reverting a resize."""
         # The original vm was suffixed with '-orig'; find it using
         # the old suffix, remove the suffix, then power it back on.
@@ -972,15 +976,15 @@ class VMwareVMOps(object):
         LOG.debug(_("Renamed the VM from %s") % name_label,
                   instance=instance)
         if power_on:
-            self.power_on(instance)
+            self._power_on(instance)
 
     def finish_migration(self, context, migration, instance, disk_info,
                          network_info, image_meta, resize_instance=False,
-                         power_on=True):
+                         block_device_info=None, power_on=True):
         """Completes a resize, turning on the migrated instance."""
         # 4. Start VM
         if power_on:
-            self.power_on(instance)
+            self._power_on(instance)
         self._update_instance_progress(context, instance,
                                        step=4,
                                        total_steps=RESIZE_TOTAL_STEPS)
diff --git a/nova/virt/xenapi/agent.py b/nova/virt/xenapi/agent.py
index 05a0fae41..0bd6d776e 100644
--- a/nova/virt/xenapi/agent.py
+++ b/nova/virt/xenapi/agent.py
@@ -197,7 +197,7 @@ class XenAPIBasedAgent(object):
         if sshkey:
             ctxt = context.get_admin_context()
             enc = crypto.ssh_encrypt_text(sshkey, new_pass)
-            sys_meta = utils.metadata_to_dict(self.instance['system_metadata'])
+            sys_meta = utils.instance_sys_meta(self.instance)
             sys_meta.update(password.convert_password(ctxt,
                                                       base64.b64encode(enc)))
             self.virtapi.instance_update(ctxt, self.instance['uuid'],
diff --git a/nova/virt/xenapi/driver.py b/nova/virt/xenapi/driver.py
index 12a087929..37aed9812 100755
--- a/nova/virt/xenapi/driver.py
+++ b/nova/virt/xenapi/driver.py
@@ -266,7 +266,8 @@ class XenAPIDriver(driver.ComputeDriver):
         """Power off the specified instance."""
         self._vmops.power_off(instance)
 
-    def power_on(self, instance):
+    def power_on(self, context, instance, network_info,
+                 block_device_info=None):
         """Power on the specified instance."""
         self._vmops.power_on(instance)
 
diff --git a/nova/virt/xenapi/vm_utils.py b/nova/virt/xenapi/vm_utils.py
index ff6f7f266..6e9f09184 100644
--- a/nova/virt/xenapi/vm_utils.py
+++ b/nova/virt/xenapi/vm_utils.py
@@ -1017,7 +1017,7 @@ def _create_image(context, session, instance, name_label, image_id,
     elif cache_images == 'all':
         cache = True
     elif cache_images == 'some':
-        sys_meta = utils.metadata_to_dict(instance['system_metadata'])
+        sys_meta = utils.instance_sys_meta(instance)
         try:
             cache = strutils.bool_from_string(sys_meta['image_cache_in_nova'])
         except KeyError:
@@ -1112,7 +1112,7 @@ def _image_uses_bittorrent(context, instance):
     if xenapi_torrent_images == 'all':
         bittorrent = True
     elif xenapi_torrent_images == 'some':
-        sys_meta = utils.metadata_to_dict(instance['system_metadata'])
+        sys_meta = utils.instance_sys_meta(instance)
         try:
             bittorrent = strutils.bool_from_string(
                 sys_meta['image_bittorrent'])
@@ -1142,7 +1142,7 @@ def _fetch_vhd_image(context, session, instance, image_id):
     if _image_uses_bittorrent(context, instance):
         plugin_name = 'bittorrent'
         callback = None
-        _add_bittorrent_params(params)
+        _add_bittorrent_params(image_id, params)
     else:
         plugin_name = 'glance'
         callback = _generate_glance_callback(context)
@@ -1180,20 +1180,18 @@ def _generate_glance_callback(context):
     return pick_glance
 
 
-def _add_bittorrent_params(params):
-        params['torrent_base_url'] = CONF.xenapi_torrent_base_url
-        params['torrent_seed_duration'] = CONF.xenapi_torrent_seed_duration
-        params['torrent_seed_chance'] = CONF.xenapi_torrent_seed_chance
-        params['torrent_max_last_accessed'] =\
-                CONF.xenapi_torrent_max_last_accessed
-        params['torrent_listen_port_start'] =\
-                CONF.xenapi_torrent_listen_port_start
-        params['torrent_listen_port_end'] =\
-                CONF.xenapi_torrent_listen_port_end
-        params['torrent_download_stall_cutoff'] =\
-                CONF.xenapi_torrent_download_stall_cutoff
-        params['torrent_max_seeder_processes_per_host'] =\
-                CONF.xenapi_torrent_max_seeder_processes_per_host
+def _add_bittorrent_params(image_id, params):
+    params['torrent_url'] = urlparse.urljoin(CONF.xenapi_torrent_base_url,
+                                             "%s.torrent" % image_id)
+    params['torrent_seed_duration'] = CONF.xenapi_torrent_seed_duration
+    params['torrent_seed_chance'] = CONF.xenapi_torrent_seed_chance
+    params['torrent_max_last_accessed'] = CONF.xenapi_torrent_max_last_accessed
+    params['torrent_listen_port_start'] = CONF.xenapi_torrent_listen_port_start
+    params['torrent_listen_port_end'] = CONF.xenapi_torrent_listen_port_end
+    params['torrent_download_stall_cutoff'] = \
+            CONF.xenapi_torrent_download_stall_cutoff
+    params['torrent_max_seeder_processes_per_host'] = \
+            CONF.xenapi_torrent_max_seeder_processes_per_host
 
 
 def _get_vdi_chain_size(session, vdi_uuid):
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
index 8ae93698d..70c62ec23 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/bittorrent
@@ -49,12 +49,11 @@ def _make_torrent_cache():
     return torrent_cache_path
 
 
-def _fetch_torrent_file(torrent_cache_path, image_id, torrent_base_url):
+def _fetch_torrent_file(torrent_cache_path, image_id, torrent_url):
     torrent_path = os.path.join(
             torrent_cache_path, image_id + '.torrent')
 
     if not os.path.exists(torrent_path):
-        torrent_url = torrent_base_url + "/%s.torrent" % image_id
         logging.info("Downloading %s" % torrent_url)
 
         # Write contents to temporary path to ensure we don't have partially
@@ -250,7 +249,7 @@ def _make_seed_cache():
     return seed_cache_path
 
 
-def download_vhd(session, image_id, torrent_base_url, torrent_seed_duration,
+def download_vhd(session, image_id, torrent_url, torrent_seed_duration,
                  torrent_seed_chance, torrent_max_last_accessed,
                  torrent_listen_port_start, torrent_listen_port_end,
                  torrent_download_stall_cutoff, uuid_stack, sr_path,
@@ -266,7 +265,7 @@ def download_vhd(session, image_id, torrent_base_url, torrent_seed_duration,
     _reap_old_torrent_files(torrent_cache_path, torrent_max_last_accessed)
 
     torrent_path = _fetch_torrent_file(
-            torrent_cache_path, image_id, torrent_base_url)
+            torrent_cache_path, image_id, torrent_url)
 
     staging_path = utils.make_staging_area(sr_path)
     try:
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py
index 95f01bba3..a15ace92a 100644
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/utils.py
@@ -46,7 +46,13 @@ def _link(src, dst):
 
 def _rename(src, dst):
     LOG.info("Renaming file '%s' -> '%s'" % (src, dst))
-    os.rename(src, dst)
+    try:
+        os.rename(src, dst)
+    except OSError, e:
+        if e.errno == errno.EXDEV:
+            LOG.error("Invalid cross-device link.  Perhaps %s and %s should "
+                      "be symlinked on the same filesystem?" % (src, dst))
+        raise
 
 
 def make_subprocess(cmdline, stdout=False, stderr=False, stdin=False,
diff --git a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py
index 9c86b7cb7..a12704248 100755
--- a/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py
+++ b/plugins/xenserver/xenapi/etc/xapi.d/plugins/xenstore.py
@@ -159,7 +159,13 @@ def delete_record(self, arg_dict):
     VM and the specified path from xenstore.
     """
     cmd = ["xenstore-rm", "/local/domain/%(dom_id)s/%(path)s" % arg_dict]
-    ret, result = _run_command(cmd)
+    try:
+        ret, result = _run_command(cmd)
+    except XenstoreError, e:
+        if 'could not remove path' in e.stderr:
+            # Entry already gone.  We're good to go.
+            return ''
+        raise
     return result
 
 
diff --git a/requirements.txt b/requirements.txt
index ce8cd716f..68cec7c31 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,6 @@ paramiko
 pyasn1
 Babel>=0.9.6
 iso8601>=0.1.4
-httplib2
 requests>=1.1,<1.2.1 # order-dependent python-cinderclient req cap, bug 1182271
 python-cinderclient>=1.0.1
 python-quantumclient>=2.2.0,<3.0.0
diff --git a/setup.cfg b/setup.cfg
index 5b850f622..5b52a5464 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -56,10 +56,15 @@ console_scripts =
 nova.api.v3.extensions =
     certificates = nova.api.openstack.compute.plugins.v3.certificates:Certificates
     consoles = nova.api.openstack.compute.plugins.v3.consoles:Consoles
+    evacuate = nova.api.openstack.compute.plugins.v3.evacuate:Evacuate
     extension_info = nova.api.openstack.compute.plugins.v3.extension_info:ExtensionInfo
     fixed_ips = nova.api.openstack.compute.plugins.v3.fixed_ips:FixedIPs
+    flavors = nova.api.openstack.compute.plugins.v3.flavors:Flavors
+    flavor_access = nova.api.openstack.compute.plugins.v3.flavor_access:FlavorAccess
     ips = nova.api.openstack.compute.plugins.v3.ips:IPs
     keypairs = nova.api.openstack.compute.plugins.v3.keypairs:Keypairs
+    quota_sets = nova.api.openstack.compute.plugins.v3.quota_sets:QuotaSets
+    rescue = nova.api.openstack.compute.plugins.v3.rescue:Rescue
     servers = nova.api.openstack.compute.plugins.v3.servers:Servers
 
 nova.api.v3.extensions.server.create =